2
0
Эх сурвалжийг харах

revert neko arch changes
closes #8585, opens #8419

Aleksandr Kuzmenko 6 жил өмнө
parent
commit
178656df93

+ 1 - 6
Makefile.win

@@ -6,11 +6,6 @@ HAXELIB_OUTPUT=haxelib.exe
 PREBUILD_OUTPUT=prebuild.exe
 PREBUILD_OUTPUT=prebuild.exe
 EXTENSION=.exe
 EXTENSION=.exe
 PACKAGE_SRC_EXTENSION=.zip
 PACKAGE_SRC_EXTENSION=.zip
-ARCH?=32
-
-ifeq ($(ARCH),64)
-NEKO_ARCH_STR=64
-endif
 
 
 kill:
 kill:
 	-@taskkill /F /IM haxe.exe
 	-@taskkill /F /IM haxe.exe
@@ -71,7 +66,7 @@ package_choco:
 	rm -rf out/choco
 	rm -rf out/choco
 
 
 $(INSTALLER_TMP_DIR)/neko-win.zip: $(INSTALLER_TMP_DIR)
 $(INSTALLER_TMP_DIR)/neko-win.zip: $(INSTALLER_TMP_DIR)
-	wget -nv http://nekovm.org/media/neko-2.2.0-win$(NEKO_ARCH_STR).zip -O installer/neko-win.zip
+	wget -nv http://nekovm.org/media/neko-2.1.0-win.zip -O installer/neko-win.zip
 
 
 package_installer_win: $(INSTALLER_TMP_DIR)/neko-win.zip package_win
 package_installer_win: $(INSTALLER_TMP_DIR)/neko-win.zip package_win
 	$(eval OUTFILE := $(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_installer.zip)
 	$(eval OUTFILE := $(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_installer.zip)

+ 1 - 4
extra/azure-pipelines/build-windows.yml

@@ -31,10 +31,7 @@ jobs:
         displayName: Install dependencies
         displayName: Install dependencies
       - template: install-neko-snapshot.yaml
       - template: install-neko-snapshot.yaml
         parameters:
         parameters:
-          ${{ if eq(parameters.arch, '64') }}:
-            platform: windows64
-          ${{ if eq(parameters.arch, '32') }}:
-            platform: windows
+          platform: windows
       - powershell: |
       - powershell: |
           Set-PSDebug -Trace 1
           Set-PSDebug -Trace 1
           curl.exe -fsSL -o cygwin-setup.exe --retry 3 $(CYGWIN_SETUP)
           curl.exe -fsSL -o cygwin-setup.exe --retry 3 $(CYGWIN_SETUP)

+ 1 - 3
extra/azure-pipelines/install-neko-snapshot.yaml

@@ -6,9 +6,7 @@ steps:
     - powershell: |
     - powershell: |
         Invoke-WebRequest https://build.haxe.org/builds/neko/${{parameters.platform}}/neko_latest.zip -OutFile $(Agent.TempDirectory)/neko_latest.zip
         Invoke-WebRequest https://build.haxe.org/builds/neko/${{parameters.platform}}/neko_latest.zip -OutFile $(Agent.TempDirectory)/neko_latest.zip
         Expand-Archive $(Agent.TempDirectory)/neko_latest.zip -DestinationPath $(Agent.TempDirectory)
         Expand-Archive $(Agent.TempDirectory)/neko_latest.zip -DestinationPath $(Agent.TempDirectory)
-        $WIN_ARCH = If ("${{parameters.platform}}" -eq "windows") {"win"} Else {"win64"}
-        $NEKOPATH = Get-ChildItem $(Agent.TempDirectory)/neko-*-$WIN_ARCH
-        Write-Host "$NEKOPATH"
+        $NEKOPATH = Get-ChildItem $(Agent.TempDirectory)/neko-*-*
         Write-Host "##vso[task.prependpath]$NEKOPATH"
         Write-Host "##vso[task.prependpath]$NEKOPATH"
         Write-Host "##vso[task.setvariable variable=NEKOPATH]$NEKOPATH"
         Write-Host "##vso[task.setvariable variable=NEKOPATH]$NEKOPATH"
       displayName: Install Neko using snapshot from S3
       displayName: Install Neko using snapshot from S3

+ 1 - 1
extra/installer.nsi

@@ -20,7 +20,7 @@
 !define VERLONG "%%VERLONG%%"
 !define VERLONG "%%VERLONG%%"
 
 
 ; Define Neko info
 ; Define Neko info
-!define NEKO_VERSION "2.2.0"
+!define NEKO_VERSION "2.1.0"
 
 
 ; Installer details
 ; Installer details
 VIAddVersionKey "CompanyName" "Haxe Foundation"
 VIAddVersionKey "CompanyName" "Haxe Foundation"