[Oorexx-svn] SF.net SVN: oorexx:[8091] main/branches/4.1/trunk/extensions/platform/ windows/oodialog

[<mie...@us...>]

Revision: 8091
          http://oorexx.svn.sourceforge.net/oorexx/?rev=8091&view=rev
Author:   miesfeld
Date:     2012-07-17 04:31:49 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
Port a minor change to .DlgUtil::vesion in the indpendent ooDialog 4.1.1 branch to 4.1 fixes

Modified Paths:
--------------
    main/branches/4.1/trunk/extensions/platform/windows/oodialog/oodialog.mak
    main/branches/4.1/trunk/extensions/platform/windows/oodialog/oodialog.rc
    main/branches/4.1/trunk/extensions/platform/windows/oodialog/oovother.cpp

Added Paths:
-----------
    main/branches/4.1/trunk/extensions/platform/windows/oodialog/generateVersionFile.bat
    main/branches/4.1/trunk/extensions/platform/windows/oodialog/ooDialog.ver
    main/branches/4.1/trunk/extensions/platform/windows/oodialog/rexx.ico
    main/branches/4.1/trunk/extensions/platform/windows/oodialog/rexx32.exe.manifest
    main/branches/4.1/trunk/extensions/platform/windows/oodialog/rexx64.exe.manifest

Added: main/branches/4.1/trunk/extensions/platform/windows/oodialog/generateVersionFile.bat
===================================================================
--- main/branches/4.1/trunk/extensions/platform/windows/oodialog/generateVersionFile.bat	                        (rev 0)
+++ main/branches/4.1/trunk/extensions/platform/windows/oodialog/generateVersionFile.bat	2012-07-17 04:31:49 UTC (rev 8091)
@@ -0,0 +1,118 @@
+@REM
+@REM Copyright (c) 2012-2012 Rexx Language Association. All rights reserved.
+@REM
+@REM This program and the accompanying materials are made available under
+@REM the terms of the Common Public License v1.0 which accompanies this
+@REM distribution. A copy is also available at the following address:
+@REM http://www.oorexx.org/license.html
+@REM
+@REM Redistribution and use in source and binary forms, with or
+@REM without modification, are permitted provided that the following
+@REM conditions are met:
+@REM
+@REM Redistributions of source code must retain the above copyright
+@REM notice, this list of conditions and the following disclaimer.
+@REM Redistributions in binary form must reproduce the above copyright
+@REM notice, this list of conditions and the following disclaimer in
+@REM the documentation and/or other materials provided with the distribution.
+@REM
+@REM Neither the name of Rexx Language Association nor the names
+@REM of its contributors may be used to endorse or promote products
+@REM derived from this software without specific prior written permission.
+@REM
+@REM THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+@REM "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+@REM LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+@REM FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+@REM OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+@REM SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+@REM TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+@REM OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+@REM OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+@REM NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+@REM SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+@REM
+@ECHO OFF
+
+REM - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+REM  generateVersionFile.bat
+REM    This batch file generates, (or uses an existing,) ooDialog.ver.incl file.
+REM    If executing in a svn 'working copy' directory, it determines the current
+REM    revision number and includes that information in the generated file.  If
+REM    not a working directory, it checks for an existing ooDialog.ver.incl
+REM    file, which may have been included in a source file package when the
+REM    package was created.  If not a svn directory, and no ooDialog.ver.incl
+REM    file, simply copy ooDialog.ver to ooDialog.ver.incl.
+REM - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+REM  First parse ooDialog.ver to get the existing version numbers.
+for /F "eol=# delims== tokens=1,2,3*" %%i in (ooDialog.ver) do (
+ if %%i == OOD_MAJOR set MAJOR_NUM=%%j
+ if %%i == OOD_MINOR set MINOR_NUM=%%j
+ if %%i == OOD_MOD_LVL set LVL_NUM=%%j
+ if %%i == OOD_BLD_LVL set BLD_NUM=%%j
+)
+
+set SVN_REV=NONE
+
+for /F "usebackq tokens=1,2,3,4*" %%i in (`svn info`) do if (%%i) == (Revision:) set SVN_REV=%%j
+
+if %SVN_REV% == "NONE" goto NOSVN
+
+REM  Now write out ooDialog.ver.incl
+if exist ooDialog.ver.incl del /F /Q ooDialog.ver.incl
+for /F "delims== tokens=1,2,3*" %%i in (ooDialog.ver) do (
+ if %%i == OOD_BLD_LVL (
+   echo %%i=%SVN_REV%>> ooDialog.ver.incl
+   set BLD_NUM=%SVN_REV%
+ ) else (
+   if %%i == OOD_VER_STR (
+     echo %%i="%MAJOR_NUM%.%MINOR_NUM%.%LVL_NUM%.%SVN_REV%">> ooDialog.ver.incl
+   ) else (
+     if %%jx == x (
+       echo %%i>> ooDialog.ver.incl
+     ) else (
+       echo %%i=%%j>> ooDialog.ver.incl
+     )
+   )
+ )
+)
+echo SVN_REVSION=%SVN_REV%>> ooDialog.ver.incl
+goto DONE_OK
+
+:NOSVN
+echo In nosvn label
+if exist ooDialog.ver.incl dir ooDialog.ver.incl
+if exist ooDialog.ver.incl (
+   echo In if exist part
+   for /F "eol=# delims== tokens=1,2,3*" %%i in (ooDialog.ver.incl) do (
+    if %%i == OOD_BLD_LVL set BLD_NUM=%%j
+    if %%i == SVN_REVISION set SVN_REV=%%j
+   )
+) else (
+  echo should be copying file
+  copy ooDialog.ver ooDialog.ver.incl 1>nul 2>&1
+  set SVN_REV=%BLD_NUM%
+  echo SVN_REVSION=%SVN_REV%>> ooDialog.ver.incl
+)
+
+goto DONE_OK
+
+:DONE_ERR
+set MAJOR_NUM=
+set MINOR_NUM=
+set LVL_NUM=
+set BLD_NUM=
+set SVN_REV=
+
+exit /b 1
+
+:DONE_OK
+set MAJOR_NUM=
+set MINOR_NUM=
+set LVL_NUM=
+set BLD_NUM=
+set SVN_REV=
+exit /b 0
+
+


Property changes on: main/branches/4.1/trunk/extensions/platform/windows/oodialog/generateVersionFile.bat
___________________________________________________________________
Added: svn:eol-style
   + native

Added: main/branches/4.1/trunk/extensions/platform/windows/oodialog/ooDialog.ver
===================================================================
--- main/branches/4.1/trunk/extensions/platform/windows/oodialog/ooDialog.ver	                        (rev 0)
+++ main/branches/4.1/trunk/extensions/platform/windows/oodialog/ooDialog.ver	2012-07-17 04:31:49 UTC (rev 8091)
@@ -0,0 +1,8 @@
+# This defines the current version of ooDialog
+OOD_MAJOR=4
+OOD_MINOR=1
+OOD_MOD_LVL=0
+OOD_BLD_LVL=0
+OOD_VER_STR="4.1.0"
+OOD_COPY_YEAR="2005-2012"
+


Property changes on: main/branches/4.1/trunk/extensions/platform/windows/oodialog/ooDialog.ver
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: main/branches/4.1/trunk/extensions/platform/windows/oodialog/oodialog.mak
===================================================================
--- main/branches/4.1/trunk/extensions/platform/windows/oodialog/oodialog.mak	2012-07-17 03:42:44 UTC (rev 8090)
+++ main/branches/4.1/trunk/extensions/platform/windows/oodialog/oodialog.mak	2012-07-17 04:31:49 UTC (rev 8091)
@@ -35,53 +35,90 @@
 #/* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.               */
 #/*                                                                            */
 #/*----------------------------------------------------------------------------*/
-# NMAKE-compatible MAKE file for FNTEST*
-all:  $(OR_OUTDIR)\oodialog.dll
 
-!include "$(OR_LIBSRC)\ORXWIN32.MAK"
+# NOTE:  /OPT:REF in linker flags eliminates unreferenced functions and data.
+#        Need to use /Gy when compiling to use /OPT:REF.
+
+# NMAKE-compatible MAKE file for ooDialog
+
+# If OOD_INDEPENDENT is defined we are operating outside of the interpreter
+# build.  In that case, OOD_OUTDIR, OOD_OODIALOGSRC, and OOD_INCLUDE_File are
+# defined in the parent make file that calls us.  When called in the interpreter
+# build process, we set those macros using the OR_xx values set by the build
+# batch files.
+
+!ifdef OOD_INDEPENDENT
+
+REXXAPI_LIBS = $(REXX_LIBS)
+
+!else
+
+OOD_OUTDIR=$(OR_OUTDIR)
+OOD_OODIALOGSRC=$(OR_OODIALOGSRC)
+REXXAPI_LIBS = $(OR_OUTDIR)\rexx.lib $(OR_OUTDIR)\rexxapi.lib
+OOD_INCLUDE_FILE = "$(OR_LIBSRC)\ORXWIN32.MAK"
+
+!endif
+
+# Generate the version information.  Quit if there is an error.
+!IF [generateVersionFile.bat] != 0
+!  ERROR Build error: could not gerate version file, ooDialog.ver.incl
+!ENDIF
+
+!include ooDialog.ver.incl
+!include $(OOD_INCLUDE_FILE)
+
+# The ooDialog specific version definition
+ood_ver_def = -DOOD_VER=$(OOD_MAJOR) -DOOD_REL=$(OOD_MINOR) -DOOD_MOD=$(OOD_MOD_LVL) -DOOD_BLD=$(OOD_BLD_LVL) -DOOD_COPY_YEAR=\"$(OOD_COPY_YEAR)\"
+
+# We use our own rc flags version.
+rcflags_oodialog = rc /NOLOGO /DWIN32 -dOODIALOG_VER=$(OOD_MAJOR) -dOODIALOG_REL=$(OOD_MINOR) -dOODIALOG_SUB=$(OOD_MOD_LVL) -dOODIALOG_BLD=$(OOD_BLD_LVL) -dOODIALOG_VER_STR=\"$(OOD_VER_STR)\" -dOODIALOG_COPY_YEAR=\"$(OOD_COPY_YEAR)\" -dMANIFEST_FILE=$(M_FILE)
+
 C=cl
-OPTIONS= $(cflags_common) $(cflags_dll) $(OR_ORYXINCL)
-OR_LIB=$(OR_OUTDIR)
+OPTIONS= $(cflags_common) $(ood_ver_def) $(cflags_dll) $(OR_ORYXINCL)
 
-SOURCEF= $(OR_OUTDIR)\oovutil.obj $(OR_OUTDIR)\oovdata.obj $(OR_OUTDIR)\oovtext.obj $(OR_OUTDIR)\oovtools.obj \
-         $(OR_OUTDIR)\oovmsg.obj $(OR_OUTDIR)\oovscrll.obj $(OR_OUTDIR)\oovdeskt.obj $(OR_OUTDIR)\oovdraw.obj \
-         $(OR_OUTDIR)\oovuser.obj $(OR_OUTDIR)\oovbmp.obj $(OR_OUTDIR)\oovother.obj $(OR_OUTDIR)\menu.obj \
-         $(OR_OUTDIR)\oodialog.res
+SOURCEF= $(OOD_OUTDIR)\oovutil.obj $(OOD_OUTDIR)\oovdata.obj $(OOD_OUTDIR)\oovtext.obj $(OOD_OUTDIR)\oovtools.obj \
+         $(OOD_OUTDIR)\oovmsg.obj $(OOD_OUTDIR)\oovscrll.obj $(OOD_OUTDIR)\oovdeskt.obj $(OOD_OUTDIR)\oovdraw.obj \
+         $(OOD_OUTDIR)\oovuser.obj $(OOD_OUTDIR)\oovbmp.obj $(OOD_OUTDIR)\oovother.obj $(OOD_OUTDIR)\menu.obj \
+         $(OOD_OUTDIR)\oodialog.res
 
-.c{$(OR_OUTDIR)}.obj:
-    $(C) $(OPTIONS)  /DINCL_32  -c $(@B).c /DCREATEDLL /Fo$(OR_OUTDIR)\$(@B).obj
+all:  $(OOD_OUTDIR)\oodialog.dll
 
+.c{$(OOD_OUTDIR)}.obj:
+    $(C) $(OPTIONS)  /DINCL_32  -c $(@B).c /DCREATEDLL /Fo$(OOD_OUTDIR)\$(@B).obj
+
 #
 # *** .cpp -> .obj rules
 #
-{$(OR_OODIALOGSRC)}.cpp{$(OR_OUTDIR)}.obj:
+{$(OOD_OODIALOGSRC)}.cpp{$(OOD_OUTDIR)}.obj:
     @ECHO .
     @ECHO Compiling $(@B).cpp
-    $(OR_CC) $(cflags_common) $(cflags_dll) /DCREATEDLL /Fo$(OR_OUTDIR)\$(@B).obj $(OR_ORYXINCL)  $(OR_OODIALOGSRC)\$(@B).cpp
+    $(OR_CC) $(cflags_common) $(ood_ver_def) $(cflags_dll) /DCREATEDLL /Fo$(OOD_OUTDIR)\$(@B).obj $(OR_ORYXINCL)  $(OOD_OODIALOGSRC)\$(@B).cpp
 
 
-{$(OR_OODIALOGSRC)}.c{$(OR_OUTDIR)}.obj:
+{$(OOD_OODIALOGSRC)}.c{$(OOD_OUTDIR)}.obj:
     @ECHO .
     @ECHO Compiling $(@B).c
-    $(OR_CC) $(cflags_common) $(cflags_dll) /DCREATEDLL /Fo$(OR_OUTDIR)\$(@B).obj $(OR_ORYXINCL)  $(OR_OODIALOGSRC)\$(@B).c
+    $(OR_CC) $(cflags_common) $(ood_ver_def)  $(cflags_dll) /DCREATEDLL /Fo$(OOD_OUTDIR)\$(@B).obj $(OR_ORYXINCL)  $(OOD_OODIALOGSRC)\$(@B).c
 
 
-$(OR_OUTDIR)\oodialog.dll:     $(SOURCEF)
+$(OOD_OUTDIR)\oodialog.dll: $(SOURCEF)
+    @ECHO .
+    @ECHO Linking $(OOD_OUTDIR)\oodialog.dll
     $(OR_LINK) \
-        $(SOURCEF)  \
+    $(SOURCEF)  \
     $(lflags_common) $(lflags_dll) \
-    $(OR_LIB)\rexx.lib \
-    $(OR_LIB)\rexxapi.lib \
+    $(REXXAPI_LIBS) \
     WINMM.LIB \
     COMDLG32.LIB \
     COMCTL32.LIB \
     shlwapi.lib \
-    -def:$(OR_OODIALOGSRC)\oovutil.def \
-    -out:$(OR_OUTDIR)\$(@B).dll
+    -def:$(OOD_OODIALOGSRC)\oovutil.def \
+    -out:$(OOD_OUTDIR)\$(@B).dll
 
 
 # Update the version information block
-$(OR_OUTDIR)\oodialog.res: $(OR_OODIALOGSRC)\oodialog.rc
+$(OOD_OUTDIR)\oodialog.res: $(OOD_OODIALOGSRC)\oodialog.rc
     @ECHO .
     @ECHO ResourceCompiling $(@B).res
-        $(rc) $(rcflags_common) /i $(OR_OODIALOGSRC) /i $(OR_WINKERNELSRC) -r -fo$(OR_OUTDIR)\$(@B).res $(OR_OODIALOGSRC)\$(@B).rc
+    $(rc) $(rcflags_oodialog) /i $(OOD_OODIALOGSRC) /i $(OR_WINKERNELSRC) -r -fo$(OOD_OUTDIR)\$(@B).res $(OOD_OODIALOGSRC)\$(@B).rc

Modified: main/branches/4.1/trunk/extensions/platform/windows/oodialog/oodialog.rc
===================================================================
--- main/branches/4.1/trunk/extensions/platform/windows/oodialog/oodialog.rc	2012-07-17 03:42:44 UTC (rev 8090)
+++ main/branches/4.1/trunk/extensions/platform/windows/oodialog/oodialog.rc	2012-07-17 04:31:49 UTC (rev 8091)
@@ -6,7 +6,7 @@
 // This program and the accompanying materials are made available under       */
 // the terms of the Common Public License v1.0 which accompanies this         */
 // distribution. A copy is also available at the following address:           */
-// http://www.oorexx.org/license.html                          */
+// http://www.oorexx.org/license.html                                         */
 //                                                                            */
 // Redistribution and use in source and binary forms, with or                 */
 // without modification, are permitted provided that the following            */
@@ -44,8 +44,8 @@
 IDI_DLG_OOREXX      ICON   "rexx.ico"
 
 1 VERSIONINFO
- FILEVERSION OOREXX_VER,OOREXX_REL,OOREXX_SUB,OOREXX_BLD
- PRODUCTVERSION OOREXX_VER,OOREXX_REL,OOREXX_SUB,OOREXX_BLD
+ FILEVERSION OODIALOG_VER,OODIALOG_REL,OODIALOG_SUB,OODIALOG_BLD
+ PRODUCTVERSION OODIALOG_VER,OODIALOG_REL,OODIALOG_SUB,OODIALOG_BLD
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -61,13 +61,13 @@
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "Rexx Language Association\0"
-            VALUE "FileDescription", "Open Object Rexx OODIALOG\0"
-            VALUE "FileVersion", OOREXX_VER_STR "\0"
-            VALUE "InternalName", "OODIALOG GUI\0"
-            VALUE "LegalCopyright", "Copyright \xA9 RexxLA " OOREXX_COPY_YEAR ".\0"
+            VALUE "FileDescription", "ooDialog an Open Object Rexx extension\0"
+            VALUE "FileVersion", OODIALOG_VER_STR "\0"
+            VALUE "InternalName", "ooDialog GUI\0"
+            VALUE "LegalCopyright", "Copyright \xA9 RexxLA " OODIALOG_COPY_YEAR ".\0"
             VALUE "OriginalFilename", "oodialog.dll\0"
             VALUE "ProductName", "Open Object Rexx for Windows\0"
-            VALUE "ProductVersion",  OOREXX_VER_STR "\0"
+            VALUE "ProductVersion",  OODIALOG_VER_STR "\0"
         END
     END
     BLOCK "VarFileInfo"

Modified: main/branches/4.1/trunk/extensions/platform/windows/oodialog/oovother.cpp
===================================================================
--- main/branches/4.1/trunk/extensions/platform/windows/oodialog/oovother.cpp	2012-07-17 03:42:44 UTC (rev 8090)
+++ main/branches/4.1/trunk/extensions/platform/windows/oodialog/oovother.cpp	2012-07-17 04:31:49 UTC (rev 8091)
@@ -8231,17 +8231,17 @@
     switch ( toupper(*format) )
     {
         case 'L' :
-            _snprintf(buf, sizeof(buf), "%u.%u.%u", OOD_LVL_MAJOR, OOD_LVL_MINOR, OOD_LVL_BIT);
+            _snprintf(buf, sizeof(buf), "%u.%u.%u", OOD_VER, OOD_REL, OOD_MOD);
             break;
 
         case 'S' :
-            _snprintf(buf, sizeof(buf), "%u.%u.%u.%u", ORX_VER, ORX_REL, ORX_MOD, OOREXX_BLD);
+            _snprintf(buf, sizeof(buf), "%u.%u.%u.%u", OOD_VER, OOD_REL, OOD_MOD, OOD_BLD);
             break;
 
         case 'F' :
         default :
             _snprintf(buf, sizeof(buf), "ooDialog Version %u.%u.%u.%u (an ooRexx Windows Extension)",
-                      ORX_VER, ORX_REL, ORX_MOD, OOREXX_BLD);
+                      OOD_VER, OOD_REL, OOD_MOD, OOD_BLD);
             break;
 
     }

Added: main/branches/4.1/trunk/extensions/platform/windows/oodialog/rexx.ico
===================================================================
(Binary files differ)


Property changes on: main/branches/4.1/trunk/extensions/platform/windows/oodialog/rexx.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: main/branches/4.1/trunk/extensions/platform/windows/oodialog/rexx32.exe.manifest
===================================================================
--- main/branches/4.1/trunk/extensions/platform/windows/oodialog/rexx32.exe.manifest	                        (rev 0)
+++ main/branches/4.1/trunk/extensions/platform/windows/oodialog/rexx32.exe.manifest	2012-07-17 04:31:49 UTC (rev 8091)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="X86"
+    name="RexxLA.ooRexx.rexx"
+    type="win32"
+/>
+<description>Open Object Rexx Interpreter.</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>

Added: main/branches/4.1/trunk/extensions/platform/windows/oodialog/rexx64.exe.manifest
===================================================================
--- main/branches/4.1/trunk/extensions/platform/windows/oodialog/rexx64.exe.manifest	                        (rev 0)
+++ main/branches/4.1/trunk/extensions/platform/windows/oodialog/rexx64.exe.manifest	2012-07-17 04:31:49 UTC (rev 8091)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="amd64"
+    name="RexxLA.ooRexx.rexx"
+    type="win32"
+/>
+<description>Open Object Rexx Interpreter.</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="amd64"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.