Changeset 505


Ignore:
Timestamp:
Jan 26, 2012, 5:35:31 PM (10 years ago)
Author:
Silvan Scherrer
Message:

Lucide: changed the rpm/wpi check, removed the look4dll.exe need

Location:
trunk
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Lucide/lng/Lucide.lng

    r492 r505  
    11#
    2 # Lucide language file, EN (1.3.3)
     2# Lucide language file, EN (1.3.4)
    33#
    44
  • trunk/Lucide/lng/Lucide_de.lng

    r492 r505  
    11#
    2 # Lucide language file, DE (1.3.3)
     2# Lucide language file, DE (1.3.4)
    33#
    44
  • trunk/Lucide/lng/Lucide_fr.lng

    r492 r505  
    11#
    2 # Lucide language file, FR (1.3.3)
     2# Lucide language file, FR (1.3.4)
    33# Fichier de langue de Lucide, FR (1.3.3)
    44# 2010-10-??
    55# Translator : Guillaume Gay <guillaume.gay@bigfoot.com>
    6 # Translation : 2011-03-08
     6# Translation : 2012-01-12
    77
    88#
     
    5151MENU_CONTINUOUS=En ~continu
    5252MENU_DOCUMENT_INFO=~Info. sur le document...\tCtrl+I
    53 MENU_FONTS_INFO=I~nfo. sur les ~polices...
     53MENU_FONTS_INFO=I~nfo. sur les polices...
    5454MENU_WINDOW=~Fenˆtres
    5555MENU_SHOW_NAV_PANE=Afficher le panneau de ~navigation
  • trunk/Makefile.kmk

    r504 r505  
    9898Lucide_wpi_10_SOURCES    = warpin/LngDummy.txt
    9999
    100 Lucide_wpi_99_INST               = $(notdir $(PATH_PACKING))/wpi/99/
    101 Lucide_wpi_99_SOURCES    = warpin/look4dll.exe
    102 
    103100
    104101$(LUCIDE_WPI): $(LUCIDE_WIS) install
     
    134131        $(call MSG_L1,Packing $@)
    135132        -$(QUIET)$(RM) -f $@
    136         $(QUIET)$(REDIRECT) -C $(PATH_PACKING)/zip -- zip -Sr9 $@ \* -x look4dll.exe
     133        $(QUIET)$(REDIRECT) -C $(PATH_PACKING)/zip -- zip -Sr9 $@ \*
    137134
    138135endif # IN_PACKING
  • trunk/warpin/lucide.wis.tpl

    r504 r505  
    99<!-- Every .WPI archive contains one or more packages. -->
    1010<REXX NAME=ChkREQ>
    11 call RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
    12 call SysLoadFuncs
    13 
    14 parse arg TestDll " Package:" Package
    15 
    16 /* get the temp dir */
    17 temp = WirexxGetEnv("TEMP")
    18 /* extract look4dll from package 99 to the temp location */
    19 rc = WirexxExtract(99,'look4dll.exe',temp)
    20 
    21 /* see if the dll is in the path */
    22 address cmd temp'\look4dll.exe 'TestDll' | rxqueue'
    23 
    24 /* remove look4dll again */
    25 ok = SysFileDelete(temp'\look4dll.exe')
    26 
    27 /* get the result from look4dll and parse its rc */
    28 pull look4dllout
    29 parse var look4dllout "RC="RC" - "Message
    30 RC = strip(RC)
    31 Message = strip(Message)
    32 Package = 'REQUIRES="' || strip(Package) || '"'
    33 
    34 /* generate the message string to return */
    35 if RC = 0 then MsgStr = ""; else MsgStr = Package
    36 return MsgStr
    37 </REXX>
     11    call RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
     12    call SysLoadFuncs
     13    /* based upon work from Dmitriy Kuminov */
     14    parse arg aFile " Package:" Package
     15    name = filespec('N', aFile)
     16    ext = translate(right(name, 4))
     17    search_path = ""
     18    select
     19      when (ext == '.DLL') then do
     20        config_sys = SysBootDrive()'\CONFIG.SYS'
     21        do while lines(config_sys)
     22          line = strip(linein(config_sys))
     23          if (left(line, 8) == 'LIBPATH=') then do
     24            search_path = substr(line, 9)
     25            leave
     26          end
     27        end
     28        call lineout config_sys
     29        search_path = SysQueryExtLibPath('B')';'search_path';'SysQueryExtLibPath('E')
     30      end
     31      when (ext == '.EXE') then search_path = value('PATH',, 'OS2ENVIRONMENT')
     32      when (ext == '.HLP') then search_path = value('BOOKSHELF',, 'OS2ENVIRONMENT')
     33      otherwise search_path = ''
     34    end
     35    if (search_path \= '') then do
     36      ok = value('CHKREQ_SEARCH_PATH', search_path, 'OS2ENVIRONMENT')
     37      real_file = SysSearchPath('CHKREQ_SEARCH_PATH', name)
     38      ok = value('CHKREQ_SEARCH_PATH', '', 'OS2ENVIRONMENT')
     39    end
     40    else real_file = ""
     41
     42    /* generate the message string to return */
     43    if real_file <> "" then MsgStr = ""; else MsgStr = 'REQUIRES="' || strip(Package) || '"'
     44    return MsgStr
     45</REXX>
     46
    3847
    3948<REXX NAME=nls>
Note: See TracChangeset for help on using the changeset viewer.