Changeset 323

Timestamp:

Sep 1, 2009, 6:18:32 PM (16 years ago)

Author:

Yuri Dario

Message:

New build rules for WarpIN packaging.

Location:

branches/client-1.5/src

Files:

• Makefile.kmk (modified) (6 diffs)
• resources (added)
• resources/instpl.cmd (moved) (moved from branches/client-1.5/src/instpl.cmd ) (1 diff)
• resources/ndpsmb.ndp (moved) (moved from branches/client-1.5/src/ndpsmb.ndp )
• resources/ndpsmb.wis_ (added)

branches/client-1.5/src/Makefile.kmk

@@ -61 +61 @@
 
 #build other files (e.g. help)
-OTHERS = $(PATH_BIN)/ndpsmb.hlp $(PATH_BIN)/readme.txt
-OTHER_CLEAN = $(PATH_BIN)/ndpsmb.hlp $(PATH_OBJ)/ndpsmb.ipf $(PATH_BIN)/readme.txt
+OTHERS = $(PATH_BIN)/en/ndpsmb.hlp $(PATH_BIN)/readme.txt
+OTHER_CLEAN = $(PATH_BIN)/en/ndpsmb.hlp $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_BIN)/readme.txt
 
 
@@ -68 +68 @@
 INSTALLS = ndpsmb-docs
 ndpsmb-docs_INST = bin/
-ndpsmb-docs_SOURCES = $(SAMBA)/COPYING=>COPYING ndpsmb.ndp instpl.cmd
+ndpsmb-docs_SOURCES = $(SAMBA)/COPYING=>COPYING resources/ndpsmb.ndp resources/instpl.cmd
 OTHER_CLEAN += $(PATH_BIN)/COPYING $(PATH_BIN)/ndpsmb.ndp $(PATH_BIN)/instpl.cmd 
 
@@ -74 +74 @@
 # packaging stuffs
 ifeq ($(BUILD_TYPE),debug)
-  PACKAGE_NAME = ndpsmb-$(subst .,_,$(VERSION))-$(BUILD)-debug.zip
+  PACKAGE_NAME = ndpsmb-$(subst .,_,$(VERSION))-$(BUILD)-debug
 else
-  PACKAGE_NAME = ndpsmb-$(subst .,_,$(VERSION))-$(BUILD).zip
+  PACKAGE_NAME = ndpsmb-$(subst .,_,$(VERSION))-$(BUILD)
 endif
-PACKING += $(PATH_ROOT)/dist/$(PACKAGE_NAME)
-OTHER_CLEAN += $(PATH_ROOT)/dist/$(PACKAGE_NAME) 
+PACKING += $(PATH_ROOT)/dist/$(PACKAGE_NAME).zip
+PACKING += $(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi
+OTHER_CLEAN += $(PATH_ROOT)/dist/$(PACKAGE_NAME).zip
+OTHER_CLEAN += $(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi
 
 # now include standard code
@@ -96 +98 @@
 
 # compile help file
-$(PATH_BIN)/ndpsmb.hlp: ./help/ndpsmb.ipf version.h Config.kmk
-        @ppwizard.cmd ./help/ndpsmb.ipf /Pack:N /output:$(PATH_OBJ)/ndpsmb.ipf /other /WarningsRc:0
+$(PATH_BIN)/en/ndpsmb.hlp: ./help/ndpsmb.ipf version.h Config.kmk
+        -@mkdir $(PATH_OBJ)
+        -@mkdir $(PATH_OBH)\en
+        @ppwizard.cmd ./help/ndpsmb.ipf /Pack:N /output:$(PATH_OBJ)/en/ndpsmb.ipf /other /WarningsRc:0
         -@mkdir $(PATH_BIN)
-        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/ndpsmb.ipf $(PATH_BIN)/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
+        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_BIN)/en/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
 
 # substitute macros in version.h
@@ -117 +121 @@
 $(PATH_ROOT)/dist/$(PACKAGE_NAME): \
                 $(PATH_BIN)/ndpsmb.dll \
-                $(PATH_BIN)/ndpsmb.hlp \
+                $(PATH_BIN)/en/ndpsmb.hlp \
                 $(PATH_BIN)/readme.txt
         $(QUIET)$(MKDIR) -p $(PATH_ROOT)/dist                              
@@ -123 +127 @@
         $(QUIET)zip -9 -j $@ $(PATH_BIN)/* 
 
+# final2: wpi all files!
+$(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi: \
+                ./resources/ndpsmb.wis_ \
+                $(PATH_BIN)/ndpsmb.dll \
+                $(PATH_BIN)/en/ndpsmb.hlp \
+                $(PATH_BIN)/readme.txt
+        $(QUIET)$(MKDIR) -p $(PATH_ROOT)/dist                              
+        $(QUIET)$(RM) -f $@
+        @ppwizard.cmd resources/ndpsmb.wis_ /Pack:N /output:$(PATH_OBJ)/ndpsmb.wis /other /WarningsRc:0
+        $(QUIET)$(REDIRECT) -C $(PATH_BIN)/en -- runwic.cmd $(subst /,\\,$@) -a 2 -r "*"
+        $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -s $(subst /,\\,$(PATH_OBJ))\\ndpsmb.wis -a 1 "*"

branches/client-1.5/src/resources/instpl.cmd

@@ +1 @@
+@echo off
+REM this script is executed from NLS directory!
+copy ndpsmb.hlp ..
+cd ..
 nd.exe plugin install ndpsmb.ndp
+del ndpsmb.hlp