Browse Source

fix package_choco version format

Andy Li 7 years ago
parent
commit
c6dc631c24
2 changed files with 2 additions and 1 deletions
  1. 1 0
      Makefile
  2. 1 1
      Makefile.win

+ 1 - 0
Makefile

@@ -83,6 +83,7 @@ COMMIT_DATE=$(shell \
 )
 )
 PACKAGE_FILE_NAME=haxe_$(COMMIT_DATE)_$(COMMIT_SHA)
 PACKAGE_FILE_NAME=haxe_$(COMMIT_DATE)_$(COMMIT_SHA)
 HAXE_VERSION=$(shell $(OUTPUT) -version 2>&1 | awk '{print $$1;}')
 HAXE_VERSION=$(shell $(OUTPUT) -version 2>&1 | awk '{print $$1;}')
+HAXE_VERSION_SHORT=$(shell echo "$(HAXE_VERSION)" | grep -oE "^[0-9]+\.[0-9]+\.[0-9]+")
 
 
 # using $(CURDIR) on Windows will not work since it might be a Cygwin path
 # using $(CURDIR) on Windows will not work since it might be a Cygwin path
 ifdef SYSTEMROOT
 ifdef SYSTEMROOT

+ 1 - 1
Makefile.win

@@ -60,7 +60,7 @@ package_choco:
 	mkdir -p OUTPUT
 	mkdir -p OUTPUT
 	7z x -y out/$(PACKAGE_FILE_NAME)_bin.zip -oout > log.txt || type log.txt
 	7z x -y out/$(PACKAGE_FILE_NAME)_bin.zip -oout > log.txt || type log.txt
 	mv out/$(PACKAGE_FILE_NAME) out/choco
 	mv out/$(PACKAGE_FILE_NAME) out/choco
-	sed -e 's/@SNAPSHOT_VERSION@/$(HAXE_VERSION)-SNAP$(COMMIT_DATE)/g' extra/choco/haxe.nuspec > out/choco/haxe.nuspec
+	sed -e 's/@SNAPSHOT_VERSION@/$(HAXE_VERSION_SHORT)-SNAP$(COMMIT_DATE)/g' extra/choco/haxe.nuspec > out/choco/haxe.nuspec
 	cd out/choco && choco pack
 	cd out/choco && choco pack
 	mv out/choco/haxe.*.nupkg out
 	mv out/choco/haxe.*.nupkg out
 	rm -rf out/choco
 	rm -rf out/choco