Changeset 56 for trunk/gui/printer/manager

Timestamp:

Feb 14, 2017, 6:55:44 AM (9 years ago)

Author:

Alex Taylor

Message:

Updated PrintMan to deal with RPM-installed CUPS. WPI packaging modifications. Set svn:ignore props on various directories.

Location:

trunk/gui/printer/manager

Files:

• . (modified) (1 prop)
• PRINTOOL.VRP (modified) (1 diff)
• PRINTOOL.VRX (modified) (3 diffs)
• readme.txt (modified) (4 diffs)
• wpi (modified) (1 prop)
• wpi/makewpi.cmd (modified) (1 diff)
• wpi/printman.wis (modified) (3 diffs)
• wpi/rxprtutl.dll (modified) ( previous)

trunk/gui/printer/manager/PRINTOOL.VRP

@@ -8 +8 @@
 VRXWindow: __VREMainWindow,1,506,4095,6697,8046
 VRXWindow: __VRESectionListWindow,1,614,16044,4204,4059
-VRXWindow: __VREToolsWindow,1,638,14309,5475,1661
+VRXWindow: __VREToolsWindow,1,638,14309,5466,1663
 VRXWindow: __VREWindListWindow,1,4854,16044,3505,4059
 UserFile: 1

trunk/gui/printer/manager/PRINTOOL.VRX

@@ -236 +236 @@
     PARSE ARG _host, _dest
 
+    IF globals.!programs.!lpadmin == '' THEN DO
+        CALL LINEOUT globals.!log1, 'lpadmin is not available, cannot delete CUPS queue.'
+        RETURN 0
+    END
+
     IF TRANSLATE( _host ) <> 'LOCALHOST' THEN
         del_cmd = globals.!programs.!lpadmin '-h' _host '-x' _dest
@@ -895 +900 @@
 LoadSettings: PROCEDURE EXPOSE globals.
 
-    globals.!version = '0.51'
-    globals.!copyright = '2013-2015'
+    globals.!version = '0.6'
+    globals.!copyright = '2013-2017'
 
     me = VRGet('Application', 'Program')
@@ -910 +915 @@
         cupsdrv = STRIP( cupsdrv, 'T', '\')
     globals.!cupsdir = cupsdrv'\cups'
+    IF \VRIsDir( globals.!cupsdir ) THEN DO
+        unixroot = VALUE('UNIXROOT',,'OS2ENVIRONMENT')
+        IF unixroot <> '' THEN
+            globals.!cupsdir = unixroot'\usr'
+        ELSE
+            globals.!cupsdir = cupsdrv'\usr'
+    END
 
     /* Get system paths.

trunk/gui/printer/manager/readme.txt

@@ -1 +1 @@
 PM Printer Manager
-Version 0.51
+Version 0.6
 
-  Printer Manager is a new graphical printer management tool designed to 
+  Printer Manager is a new graphical printer management tool designed to
   replace several older, separate programs by integrating their functions
   in one, centralized utility:
@@ -13 +13 @@
 
   Requirements:
-   - VROBJ.DLL (widely available, included with eCS)
-   - WPTOOLS.DLL (widely available, included with eCS)
-   - PR1UTIL.DLL (widely available, included with eCS 2.x)
-   - VROBJEX.DLL (available from http://trac.netlabs.org/vxapps, 
-                  included in eCS 2.2)
+   - VROBJ.DLL (widely available)
+   - WPTOOLS.DLL (widely available)
+   - PR1UTIL.DLL (widely available)
+   - VROBJEX.DLL (available from http://trac.netlabs.org/vxapps)
    - RXPRTUTL.DLL (included here)
 
@@ -35 +34 @@
 
   If the CUPS server (local or remote) requires password authentication for
-  the use of commands like lpadmin, lpinfo, etc. then these programs will 
+  the use of commands like lpadmin, lpinfo, etc. then these programs will
   block waiting for a password during various operations.  (There doesn't seem
   to be any way to fix this other than replacing the programs entirely... I'm
@@ -48 +47 @@
 
   PM Printer Manager
-  (C) 2013-2015 Alexander Taylor
- 
+  (C) 2013-2017 Alexander Taylor
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
- 
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
- 
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
+
   Permission is granted for the inclusion of the PM Printer Manager binaries
-  in the eComStation operating system.  In this case, the full source code 
+  in the eComStation operating system.  In this case, the full source code
   need not be included in the OS distribution so long it remains publically
   available through affiliated channels and/or in a location which is clearly
   indicated by the accompanying documentation.
 
--- 
+--
 Alex Taylor
-October 2015
+February 2017

trunk/gui/printer/manager/wpi/makewpi.cmd

@@ -19 +19 @@
 '@wic.exe' pkgname'.wpi -a 1 printman.exe'
 '@wic.exe' pkgname'.wpi -a 1 printmen.msg'
-'@wic.exe' pkgname'.wpi -a 1 rxprtutl.dll'
 '@wic.exe' pkgname'.wpi -a 1 -c.. newprint.ico'
 '@wic.exe' pkgname'.wpi -a 1 -c.. COPYING'
 '@wic.exe' pkgname'.wpi -a 1 -c.. readme.txt'
+'@wic.exe' pkgname'.wpi -a 2 rxprtutl.dll'
 '@wic.exe' pkgname'.wpi -s' wisname
 CALL ENDLOCAL

trunk/gui/printer/manager/wpi/printman.wis

@@ -12 +12 @@
         ELSE
             RETURN path'\apps'
+    </REXX>
+
+    <REXX NAME="DefaultPath2">
+        path = VALUE('OSDIR',,'OS2ENVIRONMENT')
+        IF path == '' THEN path = '?:\OS2'
+        RETURN path
     </REXX>
 
@@ -54 +60 @@
     </REXX>
 
+    <REXX NAME="ReqDLL">
+        /* Searches the system LIBPATH for the specified DLL.  If not found,
+         * returns the string 'REQUIRES=xxx'.
+         *
+         * Parameters:
+         *      dname   Name of the DLL to look for (must include extension)
+         *      reqpkg  Value of REQUIRES string to return if DLL is not found
+         */
+        CALL RxFuncAdd 'SysLoadFuncs', 'REXXUTIL', 'SysLoadFuncs'
+        CALL SysLoadFuncs
+
+        PARSE ARG dname reqpkg
+        IF dname == '' THEN RETURN ''
+
+        _bd = SysBootDrive()
+        IF _bd == '' THEN
+            _bd = FILESPEC('DRIVE', VALUE('COMSPEC',,'OS2ENVIRONMENT'))
+        _csys = _bd'\CONFIG.SYS'
+
+        CALL SysFileSearch 'LIBPATH=', _csys, 'match.'
+        DO i = 1 TO match.0
+            PARSE UPPER VAR match.i _lead 'LIBPATH=' _lpath
+            IF (_lead == '') & (_lpath <> '') THEN LEAVE
+        END
+        CALL SETLOCAL
+        _testenv = 'TEST_'dname'_LIBPATH'
+        CALL VALUE _testenv, _lpath, 'OS2ENVIRONMENT'
+        location = SysSearchPath( _testenv, dname )
+        CALL ENDLOCAL
+
+        IF location == '' THEN DO
+            CALL WirexxPutEnv dname, '0'
+            IF reqpkg <> '' THEN
+                RETURN 'REQUIRES='reqpkg
+        END
+
+        CALL WirexxPutEnv dname, '1'
+        RETURN ''
+    </REXX>
+
+    <REXX NAME="ConditionalTitle">
+        PARSE ARG dllname title
+        was_found = WirexxGetEnv( dllname )
+        IF was_found == 1 THEN
+            RETURN '[Already Installed]' title
+        ELSE
+            RETURN title
+    </REXX>
+
+    <REXX NAME="SelectIfRequired">
+        PARSE ARG dllname
+        was_found = WirexxGetEnv( dllname )
+        IF was_found == 1 THEN
+            RETURN ''
+        ELSE
+            RETURN 'SELECT'
+    </REXX>
+
+
     <!-- PACKAGES ----------------------------------------------------------->
 
     <PCK INDEX=1
-        PACKAGEID="Alex Taylor\Printer Manager\Program\0\5\1"
+        PACKAGEID="Alex Taylor\Printer Manager\Program\0\6\0"
         TITLE="Printer Manager (including English language support)"
         TARGET="=("DefaultPath")\printman"
@@ -67 +132 @@
          =("CheckDLL PR1UTIL.DLL 0 The runtime library PR1UTIL.DLL was not found on your system. You must install this library in order to use Printer Manager.")
 
+         =("ReqDLL RXPRTUTL.DLL 2")
+
         CREATEOBJECT="REPLACE WPProgram|Manage Printers|<WP_PRINTERSFOLDER>|EXENAME=$(1)\printman.exe;PROGTYPE=PM;OBJECTID=<PRINT_MANAGER>;"
-        CREATEOBJECT="REPLACE WPProgram|Install Printer|<WP_PRINTERSFOLDER>|EXENAME=$(1)\printman.exe;PARAMETERS=/create;PROGTYPE=PM;ICONFILE=$(1)\newprint.ico;OBJECTID=<ECS_PRINTGUIDE>;"
+        CREATEOBJECT="REPLACE WPProgram|Install Printer|<WP_PRINTERSFOLDER>|EXENAME=$(1)\printman.exe;PARAMETERS=/create;PROGTYPE=PM;ICONFILE=$(1)\newprint.ico;OBJECTID=<WP_PRINTGUIDE>;"
      >This package contains the graphical printer manager along with the English language files.</PCK>
+
+    <PCK INDEX=2
+        PACKAGEID="Alex Taylor\REXX Printer Utilities\Runtime\0\3"
+        TITLE="=("ConditionalTitle RXPRTUTL.DLL REXX Printer Utilities (RXPRTUTL.DLL)")"
+        TARGET="=("DefaultPath2")\dll"
+        =("SelectIfRequired RXPRTUTL.DLL")
+    >This package contains the required library VROBJ.DLL</PCK>
 
 </HEAD>