diff options
| author | Bradley Sepos <[email protected]> | 2015-09-25 17:28:42 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2015-09-25 17:29:17 -0400 |
| commit | e58b4a35d252639ae71d9740b019d5d24d467c5f (patch) | |
| tree | a0f4fb3116ad6b3073664bb741d9e8b885c9b69d | |
| parent | e500c7d15da307f62648c37bb797e93ee612fb48 (diff) | |
build: Use more concise and consistent package names.
| -rw-r--r-- | pkg/darwin/module.defs | 14 | ||||
| -rw-r--r-- | pkg/mingw/module.defs | 25 | ||||
| -rw-r--r-- | pkg/module.defs | 2 |
3 files changed, 21 insertions, 20 deletions
diff --git a/pkg/darwin/module.defs b/pkg/darwin/module.defs index 1281b9cbf..f746e0f5b 100644 --- a/pkg/darwin/module.defs +++ b/pkg/darwin/module.defs @@ -1,18 +1,18 @@ -PKG.platname = MacOSX$(suffix $(GCC.minver)) +PKG.platname = osx -PKG.cli.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-$(PKG.platname)_CLI_$(BUILD.arch).dmg -PKG.gui.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-$(PKG.platname)_GUI_$(BUILD.arch).dmg +PKG.gui.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-$(PKG.platname)-$(BUILD.arch).dmg +PKG.cli.dmg = $(PKG.out/)$(HB.name)CLI-$(HB.version)-$(PKG.platname)-$(BUILD.arch).dmg -PKG.cli.tmp.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-$(PKG.platname)_CLI_$(BUILD.arch).tmp.dmg -PKG.gui.tmp.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-$(PKG.platname)_GUI_$(BUILD.arch).tmp.dmg +PKG.gui.tmp.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-$(PKG.platname)-$(BUILD.arch).tmp.dmg +PKG.cli.tmp.dmg = $(PKG.out/)$(HB.name)CLI-$(HB.version)-$(PKG.platname)-$(BUILD.arch).tmp.dmg -STAGE.out.cli/ = $(STAGE.out/)cli/ STAGE.out.gui/ = $(STAGE.out/)gui/ +STAGE.out.cli/ = $(STAGE.out/)cli/ PKG.appcast = $(PKG.out/)$(notdir $(HB.url.appcast)) ############################################################################### -BUILD.out += $(PKG.cli.dmg) BUILD.out += $(PKG.gui.dmg) +BUILD.out += $(PKG.cli.dmg) BUILD.out += $(PKG.appcast) diff --git a/pkg/mingw/module.defs b/pkg/mingw/module.defs index c244e9165..4119d961b 100644 --- a/pkg/mingw/module.defs +++ b/pkg/mingw/module.defs @@ -1,12 +1,13 @@ -PKG.cli.zip = $(PKG.out/)$(HB.name)-$(HB.version)-$(BUILD.machine)-Win_CLI.zip
-PKG.libhb.zip = $(PKG.out/)$(HB.name)-$(HB.version)-$(BUILD.machine)-libhb.zip
-
-PKG.mingw.lib = $(SRC/)libraries
-
-STAGE.out.cli/ = $(STAGE.out/)cli/
-STAGE.out.libhb/ = $(STAGE.out/)libhb/
-
-###############################################################################
-
-BUILD.out += $(PKG.cli.zip)
-BUILD.out += $(PKG.libhb.zip)
+PKG.platname = win + +PKG.cli.zip = $(PKG.out/)$(HB.name)CLI-$(HB.version)-$(PKG.platname)-$(BUILD.arch).zip +PKG.libhb.zip = $(PKG.out/)$(HB.name)-$(HB.version)-$(BUILD.machine)-libhb.zip +PKG.mingw.lib = $(SRC/)libraries + +STAGE.out.cli/ = $(STAGE.out/)cli/ +STAGE.out.libhb/ = $(STAGE.out/)libhb/ + +############################################################################### + +BUILD.out += $(PKG.cli.zip) +BUILD.out += $(PKG.libhb.zip) diff --git a/pkg/module.defs b/pkg/module.defs index 2bc6081c4..ad0f24411 100644 --- a/pkg/module.defs +++ b/pkg/module.defs @@ -4,7 +4,7 @@ PKG.in/ = $(SRC/)pkg/ PKG.out/ = $(BUILD/)pkg/ PKG.basename = $(HB.name)-$(HB.version) -PKG.src.tar.bz2 = $(PKG.out/)$(PKG.basename).tar.bz2 +PKG.src.tar.bz2 = $(PKG.out/)$(PKG.basename)-source.tar.bz2 PKG.src-contrib.tar.bz2 = $(PKG.out/)$(PKG.basename)-contrib.tar.bz2 STAGE.out/ = $(BUILD/)stage/ |