Ignore:
Timestamp:
Jan 26, 2012, 5:12:36 PM (14 years ago)
Author:
Silvan Scherrer
Message:

Samba Client 2.1: adjust to newer kmk

Location:
branches/client-2.1/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/client-2.1/src/Makefile.kmk

    r650 r684  
    5959ndpsmb_LIBPATH = $(SAMBA)/source/bin
    6060
    61 ndpsmb_CLEAN = rc/description.rc $(PATH_BIN)/ndpsmb.dll
     61ndpsmb_CLEAN = rc/description.rc $(PATH_STAGE_LIB)/ndpsmb.dll
    6262
    6363
    6464#build other files (e.g. help)
    65 OTHERS = $(PATH_BIN)/en/ndpsmb.hlp $(PATH_BIN)/readme.txt \
    66          $(PATH_BIN)/fr/ndpsmb.hlp $(PATH_BIN)/readme_fr.txt \
    67          $(PATH_BIN)/de/ndpsmb.hlp $(PATH_BIN)/readme_de.txt
    68 OTHER_CLEAN = $(PATH_BIN)/en/ndpsmb.hlp $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_BIN)/readme.txt \
    69               $(PATH_BIN)/fr/ndpsmb.hlp $(PATH_OBJ)/fr/ndpsmb.ipf $(PATH_BIN)/readme_fr.txt \
    70               $(PATH_BIN)/de/ndpsmb.hlp $(PATH_OBJ)/de/ndpsmb.ipf $(PATH_BIN)/readme_de.txt
     65OTHER_CLEAN = $(PATH_INST_BIN)/en/ndpsmb.hlp $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_INST_BIN)/readme.txt \
     66              $(PATH_INST_BIN)/fr/ndpsmb.hlp $(PATH_OBJ)/fr/ndpsmb.ipf $(PATH_INST_BIN)/readme_fr.txt \
     67              $(PATH_INST_BIN)/de/ndpsmb.hlp $(PATH_OBJ)/de/ndpsmb.ipf $(PATH_INST_BIN)/readme_de.txt
    7168
    7269# install some more files
    73 INSTALLS = ndpsmb-docs
    74 ndpsmb-docs_INST = bin/
    75 ndpsmb-docs_SOURCES = COPYING resources/ndpsmb.ndp resources/instpl.cmd resources/uninstpl.cmd
    76 OTHER_CLEAN += $(PATH_BIN)/COPYING $(PATH_BIN)/ndpsmb.ndp $(PATH_BIN)/instpl.cmd $(PATH_BIN)/uninstpl.cmd
     70INSTALLS = ndpsmb-docs help-system
     71ndpsmb-docs_INST = $(INST_BIN)
     72ndpsmb-docs_SOURCES = COPYING resources/ndpsmb.ndp resources/instpl.cmd resources/uninstpl.cmd \
     73
     74OTHER_CLEAN += $(INST_BIN)/COPYING $(INST_BIN)/ndpsmb.ndp $(INST_BIN)/instpl.cmd $(INST_BIN)/uninstpl.cmd
    7775 
    7876
    … …  
    8381  PACKAGE_NAME = ndpsmb-$(subst .,_,$(VERSION))-$(BUILD)
    8482endif
    85 PACKING += $(PATH_ROOT)/dist/$(PACKAGE_NAME).zip
    86 PACKING += $(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi
    87 OTHER_CLEAN += $(PATH_ROOT)/dist/$(PACKAGE_NAME).zip
    88 OTHER_CLEAN += $(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi
     83PACKING += $(PATH_OUT)/dist/$(PACKAGE_NAME).zip
     84PACKING += $(PATH_OUT)/dist/$(PACKAGE_NAME).wpi
     85OTHER_CLEAN += $(PATH_OUT)/dist/$(PACKAGE_NAME).zip
     86OTHER_CLEAN += $(PATH_OUT)/dist/$(PACKAGE_NAME).wpi
    8987
    9088# now include standard code
    … …  
    108106
    109107# compile help file
    110 $(PATH_BIN)/en/ndpsmb.hlp: ./help/ndpsmb.ipf nversion.h Config.kmk ./help/changelog.txt
     108$(PATH_INST_BIN)/en/ndpsmb.hlp: ./help/ndpsmb.ipf nversion.h Config.kmk ./help/changelog.txt
    111109        -@mkdir $(PATH_OBJ)
    112110        -@mkdir $(PATH_OBJ)\en
    113111        @ppwizard.cmd ./help/ndpsmb.ipf /Pack:N /output:$(PATH_OBJ)/en/ndpsmb.ipf /other /WarningsRc:0 /Define:en /Define:ipf
    114         -@mkdir $(PATH_BIN)
    115         -@mkdir $(PATH_BIN)\en
    116         $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_BIN)/en/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
     112        -@mkdir $(PATH_INST_BIN)
     113        -@mkdir $(PATH_INST_BIN)\en
     114        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_INST_BIN)/en/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
    117115
    118 $(PATH_BIN)/fr/ndpsmb.hlp: ./help/ndpsmb_fr.ipf nversion.h Config.kmk ./help/changelog.txt
     116$(PATH_INST_BIN)/fr/ndpsmb.hlp: ./help/ndpsmb_fr.ipf nversion.h Config.kmk ./help/changelog.txt
    119117        -@mkdir $(PATH_OBJ)
    120118        -@mkdir $(PATH_OBJ)\fr
    121119        @ppwizard.cmd ./help/ndpsmb_fr.ipf /Pack:N /output:$(PATH_OBJ)/fr/ndpsmb.ipf /other /WarningsRc:0 /Define:fr /Define:ipf
    122         -@mkdir $(PATH_BIN)
    123         -@mkdir $(PATH_BIN)\fr
    124         $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/fr/ndpsmb.ipf $(PATH_BIN)/fr/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
     120        -@mkdir $(PATH_INST_BIN)
     121        -@mkdir $(PATH_INST_BIN)\fr
     122        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/fr/ndpsmb.ipf $(PATH_INST_BIN)/fr/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
    125123
    126 $(PATH_BIN)/de/ndpsmb.hlp: ./help/ndpsmb_de.ipf nversion.h Config.kmk ./help/changelog.txt
     124$(PATH_INST_BIN)/de/ndpsmb.hlp: ./help/ndpsmb_de.ipf nversion.h Config.kmk ./help/changelog.txt
    127125        -@mkdir $(PATH_OBJ)
    128126        -@mkdir $(PATH_OBJ)\de
    129127        @ppwizard.cmd ./help/ndpsmb_de.ipf /Pack:N /output:$(PATH_OBJ)/de/ndpsmb.ipf /other /WarningsRc:0 /Define:de /Define:ipf
    130         -@mkdir $(PATH_BIN)
    131         -@mkdir $(PATH_BIN)\de
    132         $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/de/ndpsmb.ipf $(PATH_BIN)/de/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
     128        -@mkdir $(PATH_INST_BIN)
     129        -@mkdir $(PATH_INST_BIN)\de
     130        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/de/ndpsmb.ipf $(PATH_INST_BIN)/de/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
    133131
    134132
    … …  
    141139
    142140# substitute macros in docs
    143 $(PATH_BIN)/readme.txt: Config.kmk ./help/readme.txt nversion.h ./help/changelog.txt
    144         @ppwizard.cmd ./help/readme.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_BIN)/readme.txt /other /WarningsRc:0 /Define:en /Define:txt
     141$(PATH_INST_BIN)/readme.txt: Config.kmk ./help/readme.txt nversion.h ./help/changelog.txt
     142        @ppwizard.cmd ./help/readme.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_INST_BIN)/readme.txt /other /WarningsRc:0 /Define:en /Define:txt
    145143
    146 $(PATH_BIN)/readme_fr.txt: Config.kmk ./help/readme_fr.txt nversion.h ./help/changelog.txt
    147         @ppwizard.cmd ./help/readme_fr.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_BIN)/readme_fr.txt /other /WarningsRc:0 /Define:fr /Define:txt
     144$(PATH_INST_BIN)/readme_fr.txt: Config.kmk ./help/readme_fr.txt nversion.h ./help/changelog.txt
     145        @ppwizard.cmd ./help/readme_fr.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_INST_BIN)/readme_fr.txt /other /WarningsRc:0 /Define:fr /Define:txt
    148146
    149 $(PATH_BIN)/readme_de.txt: Config.kmk ./help/readme_de.txt nversion.h ./help/changelog.txt
    150         @ppwizard.cmd ./help/readme_de.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_BIN)/readme_de.txt /other /WarningsRc:0 /Define:de /Define:txt
     147$(PATH_INST_BIN)/readme_de.txt: Config.kmk ./help/readme_de.txt nversion.h ./help/changelog.txt
     148        @ppwizard.cmd ./help/readme_de.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_INST_BIN)/readme_de.txt /other /WarningsRc:0 /Define:de /Define:txt
     149
     150# copy ndpsmb.dll to the bin location
     151$(PATH_INST_BIN)/ndpsmb.dll:
     152        $(CP) $(PATH_INST_LIB)/ndpsmb.dll $(PATH_INST_BIN)
    151153
    152154# final: zip all files!
    153 $(PATH_ROOT)/dist/$(PACKAGE_NAME).zip: \
    154                 $(PATH_BIN)/instpl.cmd \
    155                 $(PATH_BIN)/uninstpl.cmd \
    156                 $(PATH_BIN)/ndpsmb.dll \
    157                 $(PATH_BIN)/COPYING \
    158                 $(PATH_BIN)/en/ndpsmb.hlp \
    159                 $(PATH_BIN)/fr/ndpsmb.hlp \
    160                 $(PATH_BIN)/de/ndpsmb.hlp \
    161                 $(PATH_BIN)/readme.txt \
    162                 $(PATH_BIN)/readme_fr.txt \
    163                 $(PATH_BIN)/readme_de.txt
    164         $(QUIET)$(MKDIR) -p $(PATH_ROOT)/dist                             
     155$(PATH_OUT)/dist/$(PACKAGE_NAME).zip: \
     156                $(PATH_INST_BIN)/instpl.cmd \
     157                $(PATH_INST_BIN)/uninstpl.cmd \
     158                $(PATH_INST_BIN)/ndpsmb.dll \
     159                $(PATH_INST_BIN)/COPYING \
     160                $(PATH_INST_BIN)/en/ndpsmb.hlp \
     161                $(PATH_INST_BIN)/fr/ndpsmb.hlp \
     162                $(PATH_INST_BIN)/de/ndpsmb.hlp \
     163                $(PATH_INST_BIN)/readme.txt \
     164                $(PATH_INST_BIN)/readme_fr.txt \
     165                $(PATH_INST_BIN)/readme_de.txt
     166        $(QUIET)$(MKDIR) -p $(PATH_OUT)/dist                             
    165167        $(QUIET)$(RM) -f $@
    166         $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- zip -Sr9 $@ \* 
     168        $(QUIET)$(REDIRECT) -C $(PATH_INST_BIN) -- zip -Sr9 $@ \*
    167169
    168170
    169171# final2: wpi all files!
    170 $(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi: \
     172$(PATH_OUT)/dist/$(PACKAGE_NAME).wpi: \
    171173                ./resources/ndpsmb.tpl \
    172                 $(PATH_BIN)/instpl.cmd \
    173                 $(PATH_BIN)/uninstpl.cmd \
    174                 $(PATH_BIN)/ndpsmb.dll \
    175                 $(PATH_BIN)/COPYING \
    176                 $(PATH_BIN)/en/ndpsmb.hlp \
    177                 $(PATH_BIN)/fr/ndpsmb.hlp \
    178                 $(PATH_BIN)/de/ndpsmb.hlp \
    179                 $(PATH_BIN)/readme.txt \
    180                 $(PATH_BIN)/readme_fr.txt \
    181                 $(PATH_BIN)/readme_de.txt
    182         $(QUIET)$(MKDIR) -p $(PATH_ROOT)/dist                             
     174                $(PATH_INST_BIN)/instpl.cmd \
     175                $(PATH_INST_BIN)/uninstpl.cmd \
     176                $(PATH_INST_BIN)/ndpsmb.dll \
     177                $(PATH_INST_BIN)/COPYING \
     178                $(PATH_INST_BIN)/en/ndpsmb.hlp \
     179                $(PATH_INST_BIN)/fr/ndpsmb.hlp \
     180                $(PATH_INST_BIN)/de/ndpsmb.hlp \
     181                $(PATH_INST_BIN)/readme.txt \
     182                $(PATH_INST_BIN)/readme_fr.txt \
     183                $(PATH_INST_BIN)/readme_de.txt
     184        $(QUIET)$(MKDIR) -p $(PATH_OUT)/dist                             
    183185        $(QUIET)$(RM) -f $@
    184186        @ppwizard.cmd resources/ndpsmb.tpl /Pack:N /output:$(PATH_OBJ)/ndpsmb.wis /other /WarningsRc:0
    185         $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -a 2 -r ".\en\*.hlp"
    186         $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -a 3 -r ".\fr\*.hlp"
    187         $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -a 4 -r ".\de\*.hlp"
    188         $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -s $(subst /,\\,$(PATH_OBJ))\\ndpsmb.wis -a 1 "*"
     187        $(QUIET)$(REDIRECT) -C $(PATH_INST_BIN) -- runwic.cmd $(subst /,\\,$@) -a 2 -r ".\en\*.hlp"
     188        $(QUIET)$(REDIRECT) -C $(PATH_INST_BIN) -- runwic.cmd $(subst /,\\,$@) -a 3 -r ".\fr\*.hlp"
     189        $(QUIET)$(REDIRECT) -C $(PATH_INST_BIN) -- runwic.cmd $(subst /,\\,$@) -a 4 -r ".\de\*.hlp"
     190        $(QUIET)$(REDIRECT) -C $(PATH_INST_BIN) -- runwic.cmd $(subst /,\\,$@) -s $(subst /,\\,$(PATH_OBJ))\\ndpsmb.wis -a 1 "*"

  • branches/client-2.1/src/resources/ndpsmb.tpl

    r683 r684  
    3030      otherwise search_path = ''
    3131    end
    32 
    3332    if (search_path \= '') then do
    3433      rc = WirexxPutEnv('CHKREQ_SEARCH_PATH', search_path)
Note: See TracChangeset for help on using the changeset viewer.