tweaked packaging

.travis.yml

@@ -6,6 +6,9 @@ env:
     - OCAMLC=ocamlc.opt
     - OCAMLOPT=ocamlopt.opt
     - ADD_REVISION=1
+    # BINTRAY_USERNAME and BINTRAY_API_KEY
+    - secure: "siKPFDGCgWXLnUQCDXzYMnpTw7EfsLsTPqL9gS3DRlHTnqkQKGJb/HnsMRrfFSgvwesmZx+3ZPhNocdIpGBuokKgkp7Rubpa1yoKmutf1+Lbatii2/c/4/LIZW2E5xqPCLGT87BYTy/peu9Bf0rspnrqqJw7MrytOBVTRR2XSe8="
+    - secure: "VBJDQNJ9uvdt0aszo7oU3txuRvjkuLmuHZGOkrd4wE/5B4sX5jzx/+dnrKcNTXJCmQ/rVLuMu9GyxqVjNHlzce678voxdQNOtNkNgpkr1qN9/A9rRnCp77hH27ErdthpWxbmcnE62hAJ83TIKSvn//5lAkx4sMCKS1NXEWQ5qec="
 
 sudo: false
 addons:
@@ -151,7 +154,7 @@ deploy:
   provider: bintray
   on:
     all_branches: true
-    condition: "-n ${BINTRAY}"
+    condition: "-e extra/bintray.json"
   skip_cleanup: true
   file: "extra/bintray.json"
   user: "${BINTRAY_USERNAME}"

Makefile

@@ -58,8 +58,14 @@ ADD_REVISION?=0
 
 BRANCH=$(shell echo $$APPVEYOR_REPO_NAME | grep -q /haxe && echo $$APPVEYOR_REPO_BRANCH || echo $$TRAVIS_REPO_SLUG | grep -q /haxe && echo $$TRAVIS_BRANCH || git rev-parse --abbrev-ref HEAD)
 COMMIT_SHA=$(shell git rev-parse --short HEAD)
-COMMIT_DATE=$(shell git show -s --format=%ci HEAD | grep -oh ....-..-..)
-PACKAGE_FILE_NAME=haxe_$(COMMIT_DATE)_$(BRANCH)_$(COMMIT_SHA)
+COMMIT_DATE=$(shell \
+	if [ "$$(uname)" == "Darwin" ]; then \
+		date -u -r $$(git show -s --format=%ct HEAD) +%Y%m%d%H%M%S; \
+	else \
+		date -u -d @$$(git show -s --format=%ct HEAD) +%Y%m%d%H%M%S; \
+	fi \
+)
+PACKAGE_FILE_NAME=haxe_$(COMMIT_DATE)_$(COMMIT_SHA)
 
 # using $(CURDIR) on Windows will not work since it might be a Cygwin path
 ifdef SYSTEMROOT
@@ -187,7 +193,7 @@ package_src:
 	mkdir -p $(PACKAGE_OUT_DIR)
 	# use git-archive-all since we have submodules
 	# https://github.com/Kentzo/git-archive-all
-	curl -s https://raw.githubusercontent.com/Kentzo/git-archive-all/master/git-archive-all | python - $(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_source$(PACKAGE_SRC_EXTENSION)
+	curl -s https://raw.githubusercontent.com/Kentzo/git-archive-all/master/git-archive-all | python - $(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_src$(PACKAGE_SRC_EXTENSION)
 
 package_bin:
 	mkdir -p $(PACKAGE_OUT_DIR)
@@ -196,7 +202,7 @@ package_bin:
 	mkdir -p $(PACKAGE_FILE_NAME)
 	cp -r $(OUTPUT) haxelib$(EXTENSION) std extra/LICENSE.txt extra/CONTRIB.txt extra/CHANGES.txt $(PACKAGE_FILE_NAME)
 	# archive
-	tar -zcf $(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME).tar.gz $(PACKAGE_FILE_NAME)
+	tar -zcf $(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_bin.tar.gz $(PACKAGE_FILE_NAME)
 	rm -r $(PACKAGE_FILE_NAME)
 
 # Clean

Makefile.win

@@ -47,6 +47,6 @@ package_bin:
 	7za x -y temp.zip -o$(PACKAGE_FILE_NAME) > log.txt || type log.txt
 	rm temp.zip
 	# archive
-	7za a -r -tzip out/$(PACKAGE_FILE_NAME).zip $(PACKAGE_FILE_NAME) > log.txt || type log.txt
+	7za a -r -tzip out/$(PACKAGE_FILE_NAME)_bin.zip $(PACKAGE_FILE_NAME) > log.txt || type log.txt
 	rm -r $(PACKAGE_FILE_NAME)
 	rm log.txt extra/log.txt

extra/bintray.tpl.json

@@ -19,7 +19,8 @@
 
     "files":
         [
-            {"includePattern": "out/(.*)", "uploadPattern": "::os::/$1"}
+            {"includePattern": "out/(.*)_src\\.(.*)", "uploadPattern": "::os::/haxe_::versionName::_src.$2"},
+            {"includePattern": "out/(.*)_bin\\.(.*)", "uploadPattern": "::os::/haxe_::versionName::_bin.$2"}
         ],
     "publish": true
 }

tests/RunCi.hx

@@ -548,23 +548,16 @@ class RunCi {
 		commit: commandResult("git", ["rev-parse", "HEAD"]).stdout.trim(),
 		date: {
 			var gitTime = commandResult("git", ["show", "-s", "--format=%ct", "HEAD"]).stdout;
-			var tz = DateTools.format(Date.now(), "%z");
-			var tzd =
-				// +/-
-				(tz.charCodeAt(0) == '+'.code ? 1 : -1) * 
-				(
-					// hour
-					(Std.parseInt(tz.substr(1,2)) * 60 * 60 * 1000) +
-					// min
-					(Std.parseInt(tz.substr(3)) * 60 * 1000)
-				);
+			var tzd = {
+				var z = Date.fromTime(0);
+				z.getHours() * 60 * 60 * 1000 + z.getMinutes() * 60 * 1000;
+			}
 			var time = Date.fromTime(Std.parseFloat(gitTime) * 1000 - tzd);
 			DateTools.format(time, "%FT%TZ");
 		}
 	}
 	static var haxeVer(default, never) = {
 		var haxe_ver = haxe.macro.Compiler.getDefine("haxe_ver");
-		trace(haxe_ver);
 		switch (haxe_ver.split(".")) {
 			case [major]:
 				major;
@@ -579,15 +572,18 @@ class RunCi {
 		}
 	}
 
-	static function main():Void {
-		Sys.putEnv("OCAMLRUNPARAM", "b");
-
-		// bintray config
-		if (Sys.getEnv("BINTRAY") != null) {
+	static function bintray():Void {
+		if (
+			Sys.getEnv("BINTRAY") != null &&
+			Sys.getEnv("BINTRAY_USERNAME") != null &&
+			Sys.getEnv("BINTRAY_API_KEY") != null
+		) {
+			// generate bintray config
 			var tpl = new Template(File.getContent("../extra/bintray.tpl.json"));
+			var compatDate = ~/[^0-9]/g.replace(gitInfo.date, "");
 			var json = tpl.execute({
 				os: systemName.toLowerCase(),
-				versionName: '${haxeVer}~${gitInfo.date}_${gitInfo.commit.substr(0,7)}',
+				versionName: '${haxeVer}+${compatDate}.${gitInfo.commit.substr(0,7)}',
 				versionDesc: "Automated CI build.",
 				gitRepo: gitInfo.repo,
 				gitBranch: gitInfo.branch,
@@ -599,6 +595,12 @@ class RunCi {
 			infoMsg("saved " + FileSystem.absolutePath(path) + " with content:");
 			Sys.println(json);
 		}
+	}
+
+	static function main():Void {
+		Sys.putEnv("OCAMLRUNPARAM", "b");
+
+		bintray();
 
 		var tests:Array<TEST> = switch (Sys.getEnv("TEST")) {
 			case null: