Ignore:
Timestamp:
Jan 21, 2011, 5:14:11 PM (15 years ago)
Author:
Herwig Bauernfeind
Message:

Samba Client 2.0: Enhanced WPI build

Location:
branches/client-2.0/src
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

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

    r520 r526  
    7474INSTALLS = ndpsmb-docs
    7575ndpsmb-docs_INST = bin/
    76 ndpsmb-docs_SOURCES = $(SAMBA)/COPYING=>COPYING resources/ndpsmb.ndp resources/instpl.cmd
    77 OTHER_CLEAN += $(PATH_BIN)/COPYING $(PATH_BIN)/ndpsmb.ndp $(PATH_BIN)/instpl.cmd
     76ndpsmb-docs_SOURCES = COPYING resources/ndpsmb.ndp resources/instpl.cmd resources/uninstpl.cmd
     77OTHER_CLEAN += $(PATH_BIN)/COPYING $(PATH_BIN)/ndpsmb.ndp $(PATH_BIN)/instpl.cmd $(PATH_BIN)/uninstpl.cmd
    7878
    7979
    … …  
    158158# final: zip all files!
    159159$(PATH_ROOT)/dist/$(PACKAGE_NAME).zip: \
     160                $(PATH_BIN)/instpl.cmd \
     161                $(PATH_BIN)/uninstpl.cmd \
    160162                $(PATH_BIN)/ndpsmb.dll \
     163                $(PATH_BIN)/COPYING \
    161164                $(PATH_BIN)/en/ndpsmb.hlp \
    162165                $(PATH_BIN)/fr/ndpsmb.hlp \
    … …  
    173176$(PATH_ROOT)/dist/$(PACKAGE_NAME).wpi: \
    174177                ./resources/ndpsmb.wis_ \
     178                $(PATH_BIN)/instpl.cmd \
     179                $(PATH_BIN)/uninstpl.cmd \
    175180                $(PATH_BIN)/ndpsmb.dll \
     181                $(PATH_BIN)/COPYING \
    176182                $(PATH_BIN)/en/ndpsmb.hlp \
    177183                $(PATH_BIN)/fr/ndpsmb.hlp \
    … …  
    183189        $(QUIET)$(RM) -f $@
    184190        @ppwizard.cmd resources/ndpsmb.wis_ /Pack:N /output:$(PATH_OBJ)/ndpsmb.wis /other /WarningsRc:0
    185         $(QUIET)$(REDIRECT) -C $(PATH_BIN)/en -- runwic.cmd $(subst /,\\,$@) -a 2 -r "*"
    186         $(QUIET)$(REDIRECT) -C $(PATH_BIN)/fr -- runwic.cmd $(subst /,\\,$@) -a 2 -r "*"
    187         $(QUIET)$(REDIRECT) -C $(PATH_BIN)/de -- runwic.cmd $(subst /,\\,$@) -a 2 -r "*"
     191        $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -a 2 -r ".\en\*.hlp"
     192        $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -a 3 -r ".\fr\*.hlp"
     193        $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -a 4 -r ".\de\*.hlp"
    188194        $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- runwic.cmd $(subst /,\\,$@) -s $(subst /,\\,$(PATH_OBJ))\\ndpsmb.wis -a 1 "*"

  • branches/client-2.0/src/resources/instpl.cmd

    r522 r526  
    33call SysLoadFuncs
    44'@echo off'
     5
     6parse source . . script
     7scriptpath = strip(filespec('D', script)||filespec('P', script),'T','\')
     8ok = directory(scriptpath)
    59
    610/* Add supported languages here */
    … …  
    1216  exit -1
    1317end
    14 else plugin = left(filespec("N",exist.1),length(filespec("N",exist.1))-4)
     18else plugin = translate(left(filespec("N",exist.1),length(filespec("N",exist.1))-4))
    1519
    1620lang = translate(arg(1))
    … …  
    1822  lang = translate(left(strip(value("LANG",,"OS2ENVIRONMENT")),2))
    1923end
     24
     25NDFS = translate(left(strip(value("NDFSDIR",,"OS2ENVIRONMENT")),2))
     26/* For SMB we also support EVFS */
     27if NDFS = "" & plugin = "NDPSMB" then do
     28   say 'Installing 'plugin' for EVFS.'
     29   say 'Install 'plugin'.dll    to 'SysBootDrive()'\ecs\dll\'plugin'.dll'
     30   'copy 'plugin'.DLL 'SysBootDrive()'\ecs\dll\'plugin'.dll 1>NUL'
     31   say 'Install 'lang'\'plugin'.hlp to 'SysBootDrive()'\ecs\help\'plugin'.hlp'
     32   'copy .\'lang'\'plugin'.hlp 'SysBootDrive()'\ecs\help\'plugin'.hlp 1>NUL'
     33   exit 0
     34end
     35
    2036if pos(lang,langs) = 0 then lang = 'EN'
    2137say 'Installing 'plugin' for 'lang
    … …  
    2339'nd.exe plugin install 'plugin'.ndp'
    2440ok = SysFileDelete(plugin".hlp")
     41exit 0

  • branches/client-2.0/src/resources/ndpsmb.wis_

    r323 r526  
    22
    33<WARPIN VERSION="1.0.18" CODEPAGE=850">
    4   <HEAD>
    5 
    6     <TITLE>Samba Plugin installer</TITLE>
     4<HEAD>
     5<TITLE>Samba Plugin installer</TITLE>
    76
    87<REXX NAME=chkndenv>
    9   rc=rxFuncAdd('SysLoadFuncs','REXXUTIL','SysLoadFuncs')
    10   rc=SysLoadFuncs
    11   ndfs=WirexxGetEnv(NDFSDIR)
    12   if ndfs = '' then do
    13      ms=WirexxShowMessage('NDFS directory not found!','The environment NDFSDIR is not set! Please (re-)install NetDrive correct. Click button to cancel the installation.',6)
    14      call WirexxCancel
    15      end
    16      else do
    17   rc = WirexxPutEnv('ndfs',ndfs)
    18      end
     8    rc=RxFuncAdd('SysLoadFuncs','REXXUTIL','SysLoadFuncs')
     9    rc=SysLoadFuncs
     10    BaseDir=translate(strip(value("NDFSDIR",,"OS2ENVIRONMENT")))
     11    if BaseDir = '' then do
     12        ms=WirexxShowMessage('NetDrive not found','Installing plugin for EVFS.',0)
     13        BaseDir = SysBootDrive()||'\ecs\dll'
     14    end
     15    rc = WirexxPutEnv('ndfs',BaseDir)
    1916</REXX>
    2017
    2118<REXX NAME=nls>
    22    call RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
    23       call SysLoadFuncs
    24       irc = SysIni('USER','PM_National','iCountry')
    25       pos = VERIFY(irc,'1234567890','N')
    26       IF pos > 0 THEN
    27         irc = SUBSTR(irc,1,pos-1)
     19    call RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
     20    call SysLoadFuncs
     21    langs = "EN,DE,FR"
     22    lang = translate(left(strip(value("LANG",,"OS2ENVIRONMENT")),2))
     23    if pos(lang,langs) = 0 then lang = 'EN'
    2824
    2925    SELECT
     26        when lang = 'FR' then do
     27            rc = WirexxPutEnv('welcome','Bienvenue dans l''installation du composant enfichable Samba pour NetDrive!')
     28            rc = WirexxPutEnv('accept','Veuillez prendre connaissance et accepter l''accord de licence suivant.')
     29            rc = WirexxPutEnv('target','Veuillez s‚lectionner le dossier de destination')
     30            rc = WirexxPutEnv('re_install','Si vous effectuez une mise
     31 jour de SearchPlus, le dossier d''installation par d‚faut sera celui actuellement utilis‚ par l''ancienne version.')
     32            rc = WirexxPutEnv('ready','Veuillez confirmer les options d''installation.')
     33            rc = WirexxPutEnv('scfind','Modifications du fichier CONFIG.SYS pr‚vues: param‚trage de la variable SCFINDUTILITY
     34 SearchPlus.exe pour en faire le programme de recherche du systŠme par d‚faut. Ces modifications n‚cessiteront un red‚marrage.')
     35            rc = WirexxPutEnv('over_write','Veuillez s‚lectionner de maniŠre
     36 ‚craser tout fichier existant.')
     37            rc = WirexxPutEnv('install','~Installation')
     38            rc = WirexxPutEnv('license','~J''accepte')
     39            rc = WirexxPutEnv('next','~Suivant')
     40            rc = WirexxPutEnv('fr_sel','SELECT DESELECT')
     41        end
    3042
    31     When irc = '33' Then Do
    32      rc = WirexxPutEnv('welcome','Bienvenue dans l''installation du composant enfichable Samba pour NetDrive!')
    33      rc = WirexxPutEnv('accept','Veuillez prendre connaissance et accepter l''accord de licence suivant.')
    34      rc = WirexxPutEnv('target','Veuillez s‚lectionner le dossier de destination')
    35      rc = WirexxPutEnv('re_install','Si vous effectuez une mise
    36  jour de SearchPlus, le dossier d''installation par d‚faut sera celui actuellement utilis‚ par l''ancienne version.')
    37      rc = WirexxPutEnv('ready','Veuillez confirmer les options d''installation.')
    38      rc = WirexxPutEnv('scfind','Modifications du fichier CONFIG.SYS pr‚vues: param‚trage de la variable SCFINDUTILITY
    39  SearchPlus.exe pour en faire le programme de recherche du systŠme par d‚faut. Ces modifications n‚cessiteront un red‚marrage.')
    40      rc = WirexxPutEnv('over_write','Veuillez s‚lectionner de maniŠre
    41  ‚craser tout fichier existant.')
    42      rc = WirexxPutEnv('install','~Installation')
    43      rc = WirexxPutEnv('license','~J''accepte')
    44      rc = WirexxPutEnv('next','~Suivant')
    45      rc = WirexxPutEnv('fr_sel','SELECT')
    46     End
    47    
    48     When irc = '49' Then Do
    49      rc = WirexxPutEnv('welcome','Willkommen zur Installation des Samba plugin fr NetDrive!')
    50      rc = WirexxPutEnv('accept','Bitte lesen folgenden Text und akzeptieren sie die Lizenzvereinbarung.')
    51      rc = WirexxPutEnv('target','W„hlen Sie bitte das Zielverzeichnis.')
    52      rc = WirexxPutEnv('re_install','Wenn dies ein Update ist, dann ist das Installationsverzeichnis das aktuelle Verzeichnis des Plugins.')
    53      rc = WirexxPutEnv('install','~Installation')
    54      rc = WirexxPutEnv('license','~Ich stimme zu')
    55      rc = WirexxPutEnv('next','W~eiter')
    56      rc = WirexxPutEnv('de_sel','SELECT NODESELECT')
    57     End
     43        when lang = 'DE' then do
     44            rc = WirexxPutEnv('welcome','Willkommen zur Installation des Samba plugin fr NetDrive!')
     45            rc = WirexxPutEnv('accept','Bitte lesen folgenden Text und akzeptieren sie die Lizenzvereinbarung.')
     46            rc = WirexxPutEnv('target','W„hlen Sie bitte das Zielverzeichnis.')
     47            rc = WirexxPutEnv('re_install','Wenn dies ein Update ist, dann ist das Installationsverzeichnis das aktuelle Verzeichnis des Plugins.')
     48            rc = WirexxPutEnv('install','~Installation')
     49            rc = WirexxPutEnv('license','~Ich stimme zu')
     50            rc = WirexxPutEnv('next','W~eiter')
     51            rc = WirexxPutEnv('de_sel','SELECT DESELECT')
     52        end
    5853
    59     Otherwise Do
     54        otherwise do
     55            rc = WirexxPutEnv('welcome','Welcome to the installation of the Samba plugin for NetDrive!')
     56            rc = WirexxPutEnv('accept','Please read and accept the following license-agreement.')
     57            rc = WirexxPutEnv('target','Please select target directory.')
     58            rc = WirexxPutEnv('re_install','If you are updating the Samba plugin for NetDrive, the default installation directory will be the current directory.')
     59            rc = WirexxPutEnv('install','~Installation')
     60            rc = WirexxPutEnv('license','I ~accept')
     61            rc = WirexxPutEnv('next','~Next')
     62            rc = WirexxPutEnv('en_sel','SELECT DESELECT')
     63        end
     64    end
     65return
     66</REXX>
    6067
    61      rc = WirexxPutEnv('welcome','Welcome to the installation of the Samba plugin for NetDrive!')
    62      rc = WirexxPutEnv('accept','Please read and accept the following license-agreement.')
    63      rc = WirexxPutEnv('target','Please select target directory.')
    64      rc = WirexxPutEnv('re_install','If you are updating the Samba plugin for NetDrive, the default installation directory will be the current directory.')
    65      rc = WirexxPutEnv('install','~Installation')
    66      rc = WirexxPutEnv('license','I ~accept')
    67      rc = WirexxPutEnv('next','~Next')
    68      rc = WirexxPutEnv('en_sel','SELECT NODESELECT')
    69     End
    70    End
    71    Return
     68<REXX NAME=get_env>
     69    Parse Arg subject .
     70    Return WirexxGetEnv(subject)
     71</REXX>
    7272
    73   </REXX>
    74   <REXX NAME=get_env>
    75    Parse Arg subject .
    76    Return WirexxGetEnv(subject)
    77   </REXX>
    78    
    79    
    80    
    81   <PCK INDEX=1
    82          PACKAGEID="netlabs.org\Samba plugin\Base\<$NDPSMB_INSTALL>"
    83          =("nls")
    84          =("chkndenv")
    85          TITLE="Samba plugin - Base Package"
    86          TARGET="$(NDFS)\InstallPackages\ndpsmb"
    87  
    88          FIXED
    89          SELECT
    90    
    91          DEEXECUTE="$(NDFSDIR)\nd.exe | plugin REMOVE ndpsmb.ndp"
    92          
    93          >This package contains core files.
    94   </PCK>
     73<PCK INDEX=1
     74    PACKAGEID="netlabs.org\Samba\Client plugin\<$NDPSMB_INSTALL>"
     75    =("nls")
     76    =("chkndenv")
     77    TITLE="Samba Client Plugin for Netdrive and EVFS"
     78    TARGET="$(NDFS)\InstallPackages\ndpsmb"
     79    FIXED
     80    SELECT
     81    DEEXECUTE="$(NDFS)\InstallPackages\ndpsmb\uninst.cmd"
     82    >This package contains the core files.
     83</PCK>
    9584
    96   <PCK INDEX=2
    97          PACKAGEID="netlabs.org\Samba plugin\Help_EN\<$NDPSMB_INSTALL>"
    98          TARGET="$(1)\en"
    99          FIXED =("get_env en_sel")
    100          REQUIRES=1
    101          TITLE="English helpfile"
    102          EXECUTE="$(1)\instpl.cmd"
    103          >This package contains the English helpfile
    104   </PCK>
     85<PCK INDEX=2
     86    PACKAGEID="netlabs.org\Samba\Client plugin help_EN\<$NDPSMB_INSTALL>"
     87    TARGET="$(1)"
     88    FIXED =("get_env en_sel")
     89    REQUIRES=1
     90    TITLE="English helpfile"
     91    EXECUTE="$(1)\instpl.cmd EN"
     92    >This package contains the English helpfile
     93</PCK>
    10594
    106   </HEAD>
     95<PCK INDEX=3
     96    PACKAGEID="netlabs.org\Samba\Client plugin help_FR\<$NDPSMB_INSTALL>"
     97    TARGET="$(1)"
     98    FIXED =("get_env fr_sel")
     99    REQUIRES=1
     100    TITLE="French helpfile"
     101    EXECUTE="$(1)\instpl.cmd FR"
     102    >This package contains the French helpfile
     103</PCK>
    107104
    108   <!-- Here come the different pages. They are linked by
    109        the <NEXTBUTTON> tags, which must have a target.
    110        Each page must have a TYPE= attribute, which tells
    111        WarpIn what will be visible on that page. -->
    112   <BODY>
    113     <!-- page 1: introductory page -->
     105<PCK INDEX=4
     106    PACKAGEID="netlabs.org\Samba\Client plugin help_DE\<$NDPSMB_INSTALL>"
     107    TARGET="$(1)"
     108    FIXED =("get_env de_sel")
     109    REQUIRES=1
     110    TITLE="Deutsche Hilfedatei"
     111    EXECUTE="$(1)\instpl.cmd DE"
     112    >Dieses Paket enth„lt die deutsche Hilfedatei
     113</PCK>
     114
     115</HEAD>
     116
     117<!-- Here come the different pages. They are linked by
     118     the <NEXTBUTTON> tags, which must have a target.
     119     Each page must have a TYPE= attribute, which tells
     120     WarpIn what will be visible on that page. -->
     121<BODY>
     122<!-- page 1: introductory page -->
    114123
    115124<PAGE INDEX=1 TYPE=README>
    … …  
    122131    <NEXTBUTTON TARGET=3>=("get_env next")</NEXTBUTTON>
    123132<TEXT>
     133Additional explanation for Netdrive:
    124134
    125 
    126 The NetDrive Control Program (ndctl.exe) must be started for the installation of this plugin. Normally it is started on systemstart.
     135The NetDrive Control Program (ndctl.exe) must be started before the installation of this plugin. Normally it is started during boot.
    127136
    128137You can start it via the "Control Panel" in your NetDrive folder (Menu NetDrive - Control Program - Start) or via commandline in your NDFSDIR (=("get_env ndfs")) (DETACH NDCTL.EXE).
Note: See TracChangeset for help on using the changeset viewer.