mirror of
				https://github.com/janet-lang/janet
				synced 2025-10-31 15:43:01 +00:00 
			
		
		
		
	Work on improving deployment for windows.
This commit is contained in:
		| @@ -30,7 +30,7 @@ install: | |||||||
|     - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %platform% |     - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %platform% | ||||||
|     - build_win test-install |     - build_win test-install | ||||||
|     - set janet_outname=%appveyor_repo_tag_name% |     - set janet_outname=%appveyor_repo_tag_name% | ||||||
|     - if "%janet_outname%"=="" set janet_outname=v1.8.1 |     - if "%janet_outname%"=="" set /P janet_outname=<build\version.txt | ||||||
| build: off | build: off | ||||||
|  |  | ||||||
| artifacts: | artifacts: | ||||||
| @@ -49,8 +49,7 @@ artifacts: | |||||||
|     - name: "janet-$(janet_outname)-windows-%platform%" |     - name: "janet-$(janet_outname)-windows-%platform%" | ||||||
|       path: dist |       path: dist | ||||||
|       type: Zip |       type: Zip | ||||||
|     - path: "janet-$(janet_outname)-windows-installer.exe" |     - name: "janet-$(janet_outname)-windows-%platform%-installer.exe" | ||||||
|       name: "janet-$(janet_outname)-windows-%platform%-installer.exe" |  | ||||||
|       type: File |       type: File | ||||||
|  |  | ||||||
| deploy: | deploy: | ||||||
|   | |||||||
| @@ -1,3 +1,6 @@ | |||||||
|  | # This file is invoked by build_win.bat | ||||||
|  | # Relevant configuration variables are set there. | ||||||
|  |  | ||||||
| Unicode True | Unicode True | ||||||
|  |  | ||||||
| !echo "Program Files: ${PROGRAMFILES}" | !echo "Program Files: ${PROGRAMFILES}" | ||||||
| @@ -20,6 +23,9 @@ VIFileVersion "${PRODUCT_VERSION}" | |||||||
|  |  | ||||||
| !if ${SIXTYFOUR} == "true" | !if ${SIXTYFOUR} == "true" | ||||||
|     !define MULTIUSER_USE_PROGRAMFILES64 |     !define MULTIUSER_USE_PROGRAMFILES64 | ||||||
|  |     !define PLATNAME "x64" | ||||||
|  | !else | ||||||
|  |     !define PLATNAME "x86" | ||||||
| !endif | !endif | ||||||
|  |  | ||||||
| # Includes | # Includes | ||||||
| @@ -36,12 +42,12 @@ Name "Janet" | |||||||
| !define DOLLAR "$" | !define DOLLAR "$" | ||||||
| !ifdef CHECK_${DOLLAR}%APPVEYOR_REPO_TAG_NAME% | !ifdef CHECK_${DOLLAR}%APPVEYOR_REPO_TAG_NAME% | ||||||
|     # We are not in the appveyor environment, use version name |     # We are not in the appveyor environment, use version name | ||||||
|     !define OUTNAME_PART v${VERSION} |     !define OUTNAME_PART ${VERSION} | ||||||
| !else | !else | ||||||
|     # We are in appveyor, use git tag name for installer |     # We are in appveyor, use git tag name for installer | ||||||
|     !define OUTNAME_PART ${OUTNAME} |     !define OUTNAME_PART ${OUTNAME} | ||||||
| !endif | !endif | ||||||
| OutFile "janet-${OUTNAME_PART}-windows-installer.exe" | OutFile "janet-${OUTNAME_PART}-windows-${PLATNAME}-installer.exe" | ||||||
|  |  | ||||||
| # Some Configuration | # Some Configuration | ||||||
| !define APPNAME "Janet" | !define APPNAME "Janet" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Calvin Rose
					Calvin Rose