Bladeren bron

[CI] let's build the installer in all build

It shouldn't take much time...
Andy Li 7 jaren geleden
bovenliggende
commit
650088c54c
5 gewijzigde bestanden met toevoegingen van 15 en 35 verwijderingen
  1. 1 0
      .travis.yml
  2. 7 1
      Makefile
  3. 4 1
      Makefile.win
  4. 1 0
      appveyor.yml
  5. 2 33
      tests/RunCi.hx

+ 1 - 0
.travis.yml

@@ -90,6 +90,7 @@ install_osx: &install_osx
   - make package_src -s
   - make -s STATICLINK=1 "LIB_PARAMS=/usr/local/opt/zlib/lib/libz.a /usr/local/lib/libpcre.a"
   - make package_bin -s
+  - make package_installer_mac -s
   - ls -l out
   - otool -L ./haxe
   - otool -L ./haxelib

+ 7 - 1
Makefile

@@ -301,6 +301,12 @@ package_unix:
 
 package_bin: package_$(PLATFORM)
 
+$(INSTALLER_TMP_DIR):
+	mkdir -p $(INSTALLER_TMP_DIR)
+
+$(INSTALLER_TMP_DIR)/neko-osx64.tar.gz: $(INSTALLER_TMP_DIR)
+	wget http://nekovm.org/media/neko-2.1.0-osx64.tar.gz -O installer/neko-osx64.tar.gz
+
 install_dox:
 	haxelib git hxparse https://github.com/Simn/hxparse master src
 	haxelib git hxtemplo https://github.com/Simn/hxtemplo
@@ -322,7 +328,7 @@ deploy_doc:
 
 # Installer
 
-package_installer_mac:
+package_installer_mac: $(INSTALLER_TMP_DIR)/neko-osx64.tar.gz package_unix
 	$(eval DOCFILE := $(shell pwd)/$(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_doc.zip)
 	$(eval OUTFILE := $(shell pwd)/$(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_installer.tar.gz)
 	$(eval PACKFILE := $(shell pwd)/$(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_bin.tar.gz)

+ 4 - 1
Makefile.win

@@ -62,7 +62,10 @@ package_choco:
 	mv out/choco/haxe.*.nupkg out
 	rm -rf out/choco
 
-package_installer_win:
+$(INSTALLER_TMP_DIR)/neko-win.zip: $(INSTALLER_TMP_DIR)
+	wget 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)
 	$(eval VERSION := $(shell haxe -version 2>&1 | cut -d ' ' -f1))
 	rm -rf $(INSTALLER_TMP_DIR)/resources

+ 1 - 0
appveyor.yml

@@ -73,6 +73,7 @@ build_script:
     - 'set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%'
     - 'set HAXEPATH=%APPVEYOR_BUILD_FOLDER%'
     - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && make -s -f Makefile.win package_bin"'
+    - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && make -s -f Makefile.win package_installer_win"'
     - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && make -s -f Makefile.win package_choco"'
     - move out\haxe.*.nupkg .
     - dir %APPVEYOR_BUILD_FOLDER%\out

+ 2 - 33
tests/RunCi.hx

@@ -703,7 +703,7 @@ class RunCi {
 					runCommand("make", ["-s", "install_dox"]);
 					runCommand("make", ["-s", "package_doc"]);
 				}
-				deployNightlies(doInstaller);
+				deployNightlies();
 			}
 		}
 	}
@@ -775,7 +775,7 @@ class RunCi {
 	/**
 		Deploy source package to hxbuilds s3
 	*/
-	static function deployNightlies(doInstaller:Bool):Void {
+	static function deployNightlies():Void {
 		var gitTime = commandResult("git", ["show", "-s", "--format=%ct", "HEAD"]).stdout;
 		var tzd = {
 			var z = Date.fromTime(0);
@@ -792,11 +792,6 @@ class RunCi {
 			Sys.getEnv("TRAVIS_PULL_REQUEST") != "true"
 		) {
 			if (ci == TravisCI) {
-				runCommand("make", ["-s", "package_unix"]);
-				if (doInstaller) {
-					getLatestNeko();
-					runCommand("make", ["-s", 'package_installer_mac']);
-				}
 				if (systemName == 'Linux') {
 					// source
 					for (file in sys.FileSystem.readDirectory('out')) {
@@ -817,15 +812,6 @@ class RunCi {
 					}
 				}
 			} else {
-				if (doInstaller) {
-					getLatestNeko();
-					var cygRoot = Sys.getEnv("CYG_ROOT");
-					if (cygRoot != null) {
-						runCommand('$cygRoot/bin/bash', ['-lc', "cd \"$OLDPWD\" && make -s -f Makefile.win package_installer_win"]);
-					} else {
-						runCommand("make", ['-f', 'Makefile.win', "-s", 'package_installer_win']);
-					}
-				}
 				for (file in sys.FileSystem.readDirectory('out')) {
 					if (file.startsWith('haxe')) {
 						if (file.endsWith('_bin.zip')) {
@@ -841,23 +827,6 @@ class RunCi {
 		}
 	}
 
-	static function getLatestNeko() {
-		if (!FileSystem.exists('installer')) {
-			FileSystem.createDirectory('installer');
-		}
-		var src = 'http://nekovm.org/media/neko-2.1.0-';
-		var suffix = systemName == 'Windows' ? 'win.zip' : 'osx64.tar.gz';
-		src += suffix;
-		runCommand("wget", [src, '-O', 'installer/neko-$suffix'], true);
-	}
-
-	static function createNsiInstaller() {
-		if (!FileSystem.exists('installer')) {
-			FileSystem.createDirectory('installer');
-		}
-		getLatestNeko();
-	}
-
 	static function fileExtension(file:String) {
 		file = haxe.io.Path.withoutDirectory(file);
 		var idx = file.indexOf('.');