Changeset 687


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

Samba Client 2.2: add rpm and wpi check to wis script, adjust to newer kmk

Location:
trunk/client/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/client/src/Makefile.kmk

    r674 r687  
    6363
    6464#build other files (e.g. help)
    65 OTHERS = $(PATH_INST_LIB)/en/ndpsmb.hlp $(PATH_INST_LIB)/readme.txt \
    66          $(PATH_INST_LIB)/fr/ndpsmb.hlp $(PATH_INST_LIB)/readme_fr.txt \
    67          $(PATH_INST_LIB)/de/ndpsmb.hlp $(PATH_INST_LIB)/readme_de.txt
    68 OTHER_CLEAN += $(PATH_INST_LIB)/en/ndpsmb.hlp $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_INST_LIB)/readme.txt \
    69               $(PATH_INST_LIB)/fr/ndpsmb.hlp $(PATH_OBJ)/fr/ndpsmb.ipf $(PATH_INST_LIB)/readme_fr.txt \
    70               $(PATH_INST_LIB)/de/ndpsmb.hlp $(PATH_OBJ)/de/ndpsmb.ipf $(PATH_INST_LIB)/readme_de.txt
    71 
     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
    7268
    7369# install some more files
    7470INSTALLS = ndpsmb-docs
    75 ndpsmb-docs_INST = lib/
     71ndpsmb-docs_INST = $(INST_BIN)
    7672ndpsmb-docs_SOURCES = COPYING resources/ndpsmb.ndp resources/instpl.cmd resources/uninstpl.cmd
    77 OTHER_CLEAN += $(PATH_INST_LIB)/COPYING $(PATH_INST_LIB)/ndpsmb.ndp $(PATH_INST_LIB)/instpl.cmd $(PATH_INST_LIB)/uninstpl.cmd $(PATH_INST_LIB)/ndpsmb.dll $(PATH_OBJ)/ndpsmb.wis
    78  
     73
     74OTHER_CLEAN += $(INST_BIN)/COPYING $(INST_BIN)/ndpsmb.ndp $(INST_BIN)/instpl.cmd $(INST_BIN)/uninstpl.cmd $(INST_BIN)/ndpsmb.dll $(PATH_OBJ)/ndpsmb.wis
    7975
    8076# packaging stuffs
    … …  
    8480  PACKAGE_NAME = ndpsmb-$(subst .,_,$(VERSION))-$(BUILD)
    8581endif
    86 PACKING += $(PATH_ROOT)/dist/$(PACKAGE_NAME).zip
    87 PACKING += $(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi
    88 OTHER_CLEAN += $(PATH_ROOT)/dist/$(PACKAGE_NAME).zip
    89 OTHER_CLEAN += $(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi
     82PACKING += $(PATH_OUT)/dist/$(PACKAGE_NAME).zip
     83PACKING += $(PATH_OUT)/dist/$(PACKAGE_NAME).wpi
     84OTHER_CLEAN += $(PATH_OUT)/dist/$(PACKAGE_NAME).zip
     85OTHER_CLEAN += $(PATH_OUT)/dist/$(PACKAGE_NAME).wpi
    9086
    9187# now include standard code
    … …  
    109105
    110106# compile help file
    111 $(PATH_INST_LIB)/en/ndpsmb.hlp: ./help/ndpsmb.ipf nversion.h Config.kmk ./help/changelog.txt
     107$(PATH_INST_BIN)/en/ndpsmb.hlp: ./help/ndpsmb.ipf nversion.h Config.kmk ./help/changelog.txt
    112108        -@mkdir $(PATH_OBJ)
    113109        -@mkdir $(PATH_OBJ)\en
    114110        @ppwizard.cmd ./help/ndpsmb.ipf /Pack:N /output:$(PATH_OBJ)/en/ndpsmb.ipf /other /WarningsRc:0 /Define:en /Define:ipf
    115         -@mkdir $(PATH_INS)
    116         -@mkdir $(PATH_INST_LIB)
    117         -@mkdir $(PATH_INST_LIB)\en
    118         $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_INST_LIB)/en/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
     111        -@mkdir $(PATH_INST_BIN)
     112        -@mkdir $(PATH_INST_BIN)\en
     113        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/en/ndpsmb.ipf $(PATH_INST_BIN)/en/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
    119114
    120 $(PATH_INST_LIB)/fr/ndpsmb.hlp: ./help/ndpsmb_fr.ipf nversion.h Config.kmk ./help/changelog.txt
     115$(PATH_INST_BIN)/fr/ndpsmb.hlp: ./help/ndpsmb_fr.ipf nversion.h Config.kmk ./help/changelog.txt
    121116        -@mkdir $(PATH_OBJ)
    122117        -@mkdir $(PATH_OBJ)\fr
    123118        @ppwizard.cmd ./help/ndpsmb_fr.ipf /Pack:N /output:$(PATH_OBJ)/fr/ndpsmb.ipf /other /WarningsRc:0 /Define:fr /Define:ipf
    124         -@mkdir $(PATH_INST_LIB)
    125         -@mkdir $(PATH_INST_LIB)\fr
    126         $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/fr/ndpsmb.ipf $(PATH_INST_LIB)/fr/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
     119        -@mkdir $(PATH_INST_BIN)
     120        -@mkdir $(PATH_INST_BIN)\fr
     121        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/fr/ndpsmb.ipf $(PATH_INST_BIN)/fr/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
    127122
    128 $(PATH_INST_LIB)/de/ndpsmb.hlp: ./help/ndpsmb_de.ipf nversion.h Config.kmk ./help/changelog.txt
     123$(PATH_INST_BIN)/de/ndpsmb.hlp: ./help/ndpsmb_de.ipf nversion.h Config.kmk ./help/changelog.txt
    129124        -@mkdir $(PATH_OBJ)
    130125        -@mkdir $(PATH_OBJ)\de
    131126        @ppwizard.cmd ./help/ndpsmb_de.ipf /Pack:N /output:$(PATH_OBJ)/de/ndpsmb.ipf /other /WarningsRc:0 /Define:de /Define:ipf
    132         -@mkdir $(PATH_INST_LIB)
    133         -@mkdir $(PATH_INST_LIB)\de
    134         $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/de/ndpsmb.ipf $(PATH_INST_LIB)/de/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
     127        -@mkdir $(PATH_INST_BIN)
     128        -@mkdir $(PATH_INST_BIN)\de
     129        $(TOOLKIT)\bin\ipfc.exe $(PATH_OBJ)/de/ndpsmb.ipf $(PATH_INST_BIN)/de/ndpsmb.hlp /COUNTRY=001 /CODEPAGE=850
    135130
    136131
    … …  
    143138
    144139# substitute macros in docs
    145 $(PATH_INST_LIB)/readme.txt: Config.kmk ./help/readme.txt nversion.h ./help/changelog.txt
    146         @ppwizard.cmd ./help/readme.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_INST_LIB)/readme.txt /other /WarningsRc:0 /Define:en /Define:txt
     140$(PATH_INST_BIN)/readme.txt: Config.kmk ./help/readme.txt nversion.h ./help/changelog.txt
     141        @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
    147142
    148 $(PATH_INST_LIB)/readme_fr.txt: Config.kmk ./help/readme_fr.txt nversion.h ./help/changelog.txt
    149         @ppwizard.cmd ./help/readme_fr.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_INST_LIB)/readme_fr.txt /other /WarningsRc:0 /Define:fr /Define:txt
     143$(PATH_INST_BIN)/readme_fr.txt: Config.kmk ./help/readme_fr.txt nversion.h ./help/changelog.txt
     144        @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
    150145
    151 $(PATH_INST_LIB)/readme_de.txt: Config.kmk ./help/readme_de.txt nversion.h ./help/changelog.txt
    152         @ppwizard.cmd ./help/readme_de.txt /option:KeepIndent=On /option:LeaveBlankLines=On /Pack:N /output:$(PATH_INST_LIB)/readme_de.txt /other /WarningsRc:0 /Define:de /Define:txt
     146$(PATH_INST_BIN)/readme_de.txt: Config.kmk ./help/readme_de.txt nversion.h ./help/changelog.txt
     147        @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
     148
     149# copy ndpsmb.dll to the bin location
     150$(PATH_INST_BIN)/ndpsmb.dll:
     151        $(CP) $(PATH_INST_LIB)/ndpsmb.dll $(PATH_INST_BIN)
    153152
    154153# final: zip all files!
    155 $(PATH_ROOT)/dist/$(PACKAGE_NAME).zip: \
    156                 $(PATH_INST_LIB)/instpl.cmd \
    157                 $(PATH_INST_LIB)/uninstpl.cmd \
    158                 $(PATH_INST_LIB)/ndpsmb.dll \
    159                 $(PATH_INST_LIB)/COPYING \
    160                 $(PATH_INST_LIB)/en/ndpsmb.hlp \
    161                 $(PATH_INST_LIB)/fr/ndpsmb.hlp \
    162                 $(PATH_INST_LIB)/de/ndpsmb.hlp \
    163                 $(PATH_INST_LIB)/readme.txt \
    164                 $(PATH_INST_LIB)/readme_fr.txt \
    165                 $(PATH_INST_LIB)/readme_de.txt
    166         $(QUIET)$(MKDIR) -p $(PATH_ROOT)/dist                             
     154$(PATH_OUT)/dist/$(PACKAGE_NAME).zip: \
     155                $(PATH_INST_BIN)/instpl.cmd \
     156                $(PATH_INST_BIN)/uninstpl.cmd \
     157                $(PATH_INST_BIN)/ndpsmb.dll \
     158                $(PATH_INST_BIN)/COPYING \
     159                $(PATH_INST_BIN)/en/ndpsmb.hlp \
     160                $(PATH_INST_BIN)/fr/ndpsmb.hlp \
     161                $(PATH_INST_BIN)/de/ndpsmb.hlp \
     162                $(PATH_INST_BIN)/readme.txt \
     163                $(PATH_INST_BIN)/readme_fr.txt \
     164                $(PATH_INST_BIN)/readme_de.txt
     165        $(QUIET)$(MKDIR) -p $(PATH_OUT)/dist                             
    167166        $(QUIET)$(RM) -f $@
    168         $(QUIET)$(REDIRECT) -C $(PATH_INST_LIB) -- zip -Sr9 $@ \* 
     167        $(QUIET)$(REDIRECT) -C $(PATH_INST_BIN) -- zip -Sr9 $@ \* 
    169168
    170169
    171170# final2: wpi all files!
    172 $(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi: \
     171$(PATH_OUT)/dist/$(PACKAGE_NAME).wpi: \
    173172                ./resources/ndpsmb.tpl \
    174                 $(PATH_INST_LIB)/instpl.cmd \
    175                 $(PATH_INST_LIB)/uninstpl.cmd \
    176                 $(PATH_INST_LIB)/ndpsmb.dll \
    177                 $(PATH_INST_LIB)/COPYING \
    178                 $(PATH_INST_LIB)/en/ndpsmb.hlp \
    179                 $(PATH_INST_LIB)/fr/ndpsmb.hlp \
    180                 $(PATH_INST_LIB)/de/ndpsmb.hlp \
    181                 $(PATH_INST_LIB)/readme.txt \
    182                 $(PATH_INST_LIB)/readme_fr.txt \
    183                 $(PATH_INST_LIB)/readme_de.txt
    184         $(QUIET)$(MKDIR) -p $(PATH_ROOT)/dist                             
     173                $(PATH_INST_BIN)/instpl.cmd \
     174                $(PATH_INST_BIN)/uninstpl.cmd \
     175                $(PATH_INST_BIN)/ndpsmb.dll \
     176                $(PATH_INST_BIN)/COPYING \
     177                $(PATH_INST_BIN)/en/ndpsmb.hlp \
     178                $(PATH_INST_BIN)/fr/ndpsmb.hlp \
     179                $(PATH_INST_BIN)/de/ndpsmb.hlp \
     180                $(PATH_INST_BIN)/readme.txt \
     181                $(PATH_INST_BIN)/readme_fr.txt \
     182                $(PATH_INST_BIN)/readme_de.txt
     183        $(QUIET)$(MKDIR) -p $(PATH_OUT)/dist                             
    185184        $(QUIET)$(RM) -f $@
    186185        @ppwizard.cmd resources/ndpsmb.tpl /Pack:N /output:$(PATH_OBJ)/ndpsmb.wis /other /WarningsRc:0
    187         $(QUIET)$(REDIRECT) -C $(PATH_INST_LIB) -- runwic.cmd $(subst /,\\,$@) -a 2 -r ".\en\*.hlp"
    188         $(QUIET)$(REDIRECT) -C $(PATH_INST_LIB) -- runwic.cmd $(subst /,\\,$@) -a 3 -r ".\fr\*.hlp"
    189         $(QUIET)$(REDIRECT) -C $(PATH_INST_LIB) -- runwic.cmd $(subst /,\\,$@) -a 4 -r ".\de\*.hlp"
    190         $(QUIET)$(REDIRECT) -C $(PATH_INST_LIB) -- runwic.cmd $(subst /,\\,$@) -s $(subst /,\\,$(PATH_OBJ))\\ndpsmb.wis -a 1 "*"
     186        $(QUIET)$(REDIRECT) -C $(PATH_INST_BIN) -- runwic.cmd $(subst /,\\,$@) -a 2 -r ".\en\*.hlp"
     187        $(QUIET)$(REDIRECT) -C $(PATH_INST_BIN) -- runwic.cmd $(subst /,\\,$@) -a 3 -r ".\fr\*.hlp"
     188        $(QUIET)$(REDIRECT) -C $(PATH_INST_BIN) -- runwic.cmd $(subst /,\\,$@) -a 4 -r ".\de\*.hlp"
     189        $(QUIET)$(REDIRECT) -C $(PATH_INST_BIN) -- runwic.cmd $(subst /,\\,$@) -s $(subst /,\\,$(PATH_OBJ))\\ndpsmb.wis -a 1 "*"

  • trunk/client/src/resources/ndpsmb.tpl

    r529 r687  
    44<HEAD>
    55<TITLE>Samba Plugin installer</TITLE>
     6
     7<REXX NAME=ChkREQ>
     8    call RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
     9    call SysLoadFuncs
     10    /* based upon work from Dmitriy Kuminov */
     11    parse arg aFile " Package:" Package
     12    name = filespec('N', aFile)
     13    ext = translate(right(name, 4))
     14    search_path = ""
     15    select
     16      when (ext == '.DLL') then do
     17        config_sys = SysBootDrive()'\CONFIG.SYS'
     18        do while lines(config_sys)
     19          line = strip(linein(config_sys))
     20          if (left(line, 8) == 'LIBPATH=') then do
     21            search_path = substr(line, 9)
     22            leave
     23          end
     24        end
     25        call lineout config_sys
     26        search_path = SysQueryExtLibPath('B')';'search_path';'SysQueryExtLibPath('E')
     27      end
     28      when (ext == '.EXE') then search_path = value('PATH',, 'OS2ENVIRONMENT')
     29      when (ext == '.HLP') then search_path = value('BOOKSHELF',, 'OS2ENVIRONMENT')
     30      otherwise search_path = ''
     31    end
     32    if (search_path \= '') then do
     33      ok = value('CHKREQ_SEARCH_PATH', search_path, 'OS2ENVIRONMENT')
     34      real_file = SysSearchPath('CHKREQ_SEARCH_PATH', name)
     35      ok = value('CHKREQ_SEARCH_PATH', '', 'OS2ENVIRONMENT')
     36    end
     37    else real_file = ""
     38
     39    /* generate the message string to return */
     40    if real_file <> "" then MsgStr = ""; else MsgStr = 'REQUIRES="' || strip(Package) || '"'
     41    return MsgStr
     42</REXX>
    643
    744<REXX NAME=chkndenv>
    … …  
    75112    =("nls")
    76113    =("chkndenv")
     114    =("ChkREQ LIBC064.DLL Package:netlabs.org\kLIBC\LIBC 0.6 Runtime\0\6\4")
     115    =("ChkREQ GCC446.DLL Package:netlabs.org\GCC4\Core\1\2\0")
     116    =("ChkREQ STDCPP.DLL Package:netlabs.org\GCC4\Core\1\2\1")
    77117    TITLE="Samba Client Plugin for Netdrive and EVFS"
    78118    TARGET="$(NDFS)\InstallPackages\ndpsmb"
Note: See TracChangeset for help on using the changeset viewer.