diff options
| author | sr55 <[email protected]> | 2015-12-13 15:51:10 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2015-12-13 15:51:10 +0000 |
| commit | 5a9ab4e32a2c3535d45c6699bdc34cdfccc230a7 (patch) | |
| tree | 340b76229f26d5a8a3706ed79910b219369123d8 | |
| parent | 2ea9c5bc828f812d44ce064c7dc500db369d018b (diff) | |
Adding libhb zip build target to 0.10.x branch.
| -rw-r--r-- | pkg/mingw/module.defs | 6 | ||||
| -rw-r--r-- | pkg/mingw/module.rules | 11 | ||||
| -rw-r--r-- | pkg/module.defs | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/pkg/mingw/module.defs b/pkg/mingw/module.defs index cce22d66f..6013a481a 100644 --- a/pkg/mingw/module.defs +++ b/pkg/mingw/module.defs @@ -1,9 +1,13 @@ -PKG.cli.zip = $(PKG.out/)$(HB.name)-$(HB.version)-$(BUILD.machine)-Win_CLI.zip
+PKG.platname = win
+PKG.cli.zip = $(PKG.out/)$(HB.name)CLI-$(HB.version)-$(PKG.platname)-$(BUILD.machine).zip
+PKG.libhb.zip = $(PKG.out/)LibHB-$(HB.version)-$(PKG.platname)-$(BUILD.machine).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/mingw/module.rules b/pkg/mingw/module.rules index 3ce0580b8..c8d132cef 100644 --- a/pkg/mingw/module.rules +++ b/pkg/mingw/module.rules @@ -1,9 +1,12 @@ -pkg.create.zip:: pkg.create $(PKG.cli.zip)
+pkg.create.zip:: pkg.create $(PKG.cli.zip) $(PKG.libhb.zip)
$(PKG.cli.zip): | $(dir $(PKG.cli.zip))
$(PKG.cli.zip): | $(STAGE.out.cli/)
cd $(STAGE.out.cli/) && $(ZIP.exe) -r $(call fn.ABSOLUTE,$(PKG.cli.zip)) .
+$(PKG.libhb.zip): | $(dir $(PKG.libhb.zip))
+$(PKG.libhb.zip): | $(STAGE.out.libhb/)
+ cd $(STAGE.out.libhb/) && $(ZIP.exe) -r $(call fn.ABSOLUTE,$(PKG.libhb.zip)) .
$(STAGE.out.cli/):
-$(MKDIR.exe) -p $@
@@ -11,4 +14,10 @@ $(STAGE.out.cli/): $(CP.exe) -R contrib/etc/fonts $(STAGE.out.cli/)/fonts/
$(call STAGE.doc,$(STAGE.out.cli/))
+$(STAGE.out.libhb/):
+ -$(MKDIR.exe) -p $@
+ $(CP.exe) libhb/hb.dll $(STAGE.out.libhb/)
+ $(CP.exe) -R contrib/etc/fonts $(STAGE.out.libhb/)/fonts/
+ $(call STAGE.doc,$(STAGE.out.libhb/))
+
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/ |