Skip to content

Commit

Permalink
revert neko arch changes
Browse files Browse the repository at this point in the history
  • Loading branch information
RealyUniqueName committed Jul 29, 2019
1 parent f244bb8 commit 178656d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
7 changes: 1 addition & 6 deletions Makefile.win
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ HAXELIB_OUTPUT=haxelib.exe
PREBUILD_OUTPUT=prebuild.exe
EXTENSION=.exe
PACKAGE_SRC_EXTENSION=.zip
ARCH?=32

ifeq ($(ARCH),64)
NEKO_ARCH_STR=64
endif

kill:
-@taskkill /F /IM haxe.exe
Expand Down Expand Up @@ -71,7 +66,7 @@ package_choco:
rm -rf out/choco

$(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
$(eval OUTFILE := $(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_installer.zip)
Expand Down
5 changes: 1 addition & 4 deletions extra/azure-pipelines/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ jobs:
displayName: Install dependencies
- template: install-neko-snapshot.yaml
parameters:
${{ if eq(parameters.arch, '64') }}:
platform: windows64
${{ if eq(parameters.arch, '32') }}:
platform: windows
platform: windows
- powershell: |
Set-PSDebug -Trace 1
curl.exe -fsSL -o cygwin-setup.exe --retry 3 $(CYGWIN_SETUP)
Expand Down
4 changes: 1 addition & 3 deletions extra/azure-pipelines/install-neko-snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ steps:
- powershell: |
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)
$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.setvariable variable=NEKOPATH]$NEKOPATH"
displayName: Install Neko using snapshot from S3
Expand Down
2 changes: 1 addition & 1 deletion extra/installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
!define VERLONG "%%VERLONG%%"

; Define Neko info
!define NEKO_VERSION "2.2.0"
!define NEKO_VERSION "2.1.0"

; Installer details
VIAddVersionKey "CompanyName" "Haxe Foundation"
Expand Down

0 comments on commit 178656d

Please sign in to comment.