rename binary packages

melsman · Jan 13, 2021 · e92de92 · e92de92
1 parent 54cdfd9
commit e92de92
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -71,7 +71,7 @@ jobs:
 
       - name: Build binary distribution
         run: |
-          make mlkit_bin_dist_linux
+          make mlkit_bin_dist
 
   build-test-macos:
 
@@ -131,4 +131,4 @@ jobs:
 
       - name: Build binary distribution
         run: |
-          make mlkit_bin_dist_macos
+          make mlkit_bin_dist
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -59,13 +59,13 @@ jobs:
 
       - name: Build binary distribution
         run: |
-          make mlkit_bin_dist_linux
+          make mlkit_bin_dist
 
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: dist/mlkit_bin_dist_linux.tgz
+          file: dist/mlkit-bin-dist-linux.tgz
           tag: ${{ github.ref }}
           overwrite: true
 
@@ -127,12 +127,12 @@ jobs:
 
       - name: Build binary distribution
         run: |
-          make mlkit_bin_dist_macos
+          make mlkit_bin_dist
 
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: dist/mlkit_bin_dist_macos.tgz
+          file: dist/mlkit-bin-dist-darwin.tgz
           tag: ${{ github.ref }}
           overwrite: true
diff --git a/Makefile.in b/Makefile.in
@@ -541,7 +541,8 @@ smltojs_x64_tgz:
 #  $ make smltojs
 #  $ make smltojs_basislibs
 # -----------------------------------------------------
-BIN_DIST?=mlkit_bin_dist
+OS=$(shell uname -s | tr '[:upper:]' '[:lower:]')
+BIN_DIST=mlkit-bin-dist-$(OS)
 .PHONY: mlkit_bin_dist
 mlkit_bin_dist:
 	$(MKDIR) dist
@@ -550,13 +551,6 @@ mlkit_bin_dist:
 	$(MAKE) install_smltojs0 DESTDIR=$(CWD)/dist/$(BIN_DIST) prefix=
 	(cd dist && tar czf $(BIN_DIST).tgz $(BIN_DIST))
 
-.PHONY: mlkit_bin_dist_linux
-mlkit_bin_dist_linux:
-	BIN_DIST=mlkit_bin_dist_linux make mlkit_bin_dist
-
-.PHONY: mlkit_bin_dist_macos
-mlkit_bin_dist_macos:
-	BIN_DIST=mlkit_bin_dist_macos make mlkit_bin_dist
 
 # -----------------------------------------------------
 # Target for building SMLserver binary package. The target

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(MLKit, [v4.5.3])
+AC_INIT(MLKit, [v4.5.4])
 AC_CONFIG_HEADERS([src/config.h])
 AC_REVISION($Revision$)
 AC_CONFIG_FILES([src/SMLserver/apache/Makefile