From: <mie...@us...> - 2010-11-08 03:07:29
|
Revision: 6374 http://oorexx.svn.sourceforge.net/oorexx/?rev=6374&view=rev Author: miesfeld Date: 2010-11-08 03:07:22 +0000 (Mon, 08 Nov 2010) Log Message: ----------- ooDialog beta - alter build to build both versions of ooDialog Modified Paths: -------------- sandbox/mark/ooDialog.beta/extensions/platform/windows/oodialog.4.1.0/oodialog.mak sandbox/mark/ooDialog.beta/extensions/platform/windows/oodialog.4.2.0/oodialog.mak sandbox/mark/ooDialog.beta/makeorx.bat sandbox/mark/ooDialog.beta/orxdb.bat sandbox/mark/ooDialog.beta/platform/windows/buildorx.bat Modified: sandbox/mark/ooDialog.beta/extensions/platform/windows/oodialog.4.1.0/oodialog.mak =================================================================== --- sandbox/mark/ooDialog.beta/extensions/platform/windows/oodialog.4.1.0/oodialog.mak 2010-11-08 01:04:21 UTC (rev 6373) +++ sandbox/mark/ooDialog.beta/extensions/platform/windows/oodialog.4.1.0/oodialog.mak 2010-11-08 03:07:22 UTC (rev 6374) @@ -36,37 +36,37 @@ #/* */ #/*----------------------------------------------------------------------------*/ # NMAKE-compatible MAKE file for FNTEST* -all: $(OR_OUTDIR)\oodialog.dll +all: $(OR_OUTDIR_OOD410)\oodialog.dll !include "$(OR_LIBSRC)\ORXWIN32.MAK" C=cl OPTIONS= $(cflags_common) $(cflags_dll) $(OR_ORYXINCL) OR_LIB=$(OR_OUTDIR) -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= $(OR_OUTDIR_OOD410)\oovutil.obj $(OR_OUTDIR_OOD410)\oovdata.obj $(OR_OUTDIR_OOD410)\oovtext.obj $(OR_OUTDIR_OOD410)\oovtools.obj \ + $(OR_OUTDIR_OOD410)\oovmsg.obj $(OR_OUTDIR_OOD410)\oovscrll.obj $(OR_OUTDIR_OOD410)\oovdeskt.obj $(OR_OUTDIR_OOD410)\oovdraw.obj \ + $(OR_OUTDIR_OOD410)\oovuser.obj $(OR_OUTDIR_OOD410)\oovbmp.obj $(OR_OUTDIR_OOD410)\oovother.obj $(OR_OUTDIR_OOD410)\menu.obj \ + $(OR_OUTDIR_OOD410)\oodialog.res -.c{$(OR_OUTDIR)}.obj: - $(C) $(OPTIONS) /DINCL_32 -c $(@B).c /DCREATEDLL /Fo$(OR_OUTDIR)\$(@B).obj +.c{$(OR_OUTDIR_OOD410)}.obj: + $(C) $(OPTIONS) /DINCL_32 -c $(@B).c /DCREATEDLL /Fo$(OR_OUTDIR_OOD410)\$(@B).obj # # *** .cpp -> .obj rules # -{$(OR_OODIALOGSRC)}.cpp{$(OR_OUTDIR)}.obj: +{$(OR_OODIALOGSRC_410)}.cpp{$(OR_OUTDIR_OOD410)}.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) $(cflags_dll) /DCREATEDLL /Fo$(OR_OUTDIR_OOD410)\$(@B).obj $(OR_ORYXINCL) $(OR_OODIALOGSRC_410)\$(@B).cpp -{$(OR_OODIALOGSRC)}.c{$(OR_OUTDIR)}.obj: +{$(OR_OODIALOGSRC_410)}.c{$(OR_OUTDIR_OOD410)}.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) $(cflags_dll) /DCREATEDLL /Fo$(OR_OUTDIR_OOD410)\$(@B).obj $(OR_ORYXINCL) $(OR_OODIALOGSRC_410)\$(@B).c -$(OR_OUTDIR)\oodialog.dll: $(SOURCEF) +$(OR_OUTDIR_OOD410)\oodialog.dll: $(SOURCEF) $(OR_LINK) \ $(SOURCEF) \ $(lflags_common) $(lflags_dll) \ @@ -76,12 +76,12 @@ COMDLG32.LIB \ COMCTL32.LIB \ shlwapi.lib \ - -def:$(OR_OODIALOGSRC)\oovutil.def \ - -out:$(OR_OUTDIR)\$(@B).dll + -def:$(OR_OODIALOGSRC_410)\oovutil.def \ + -out:$(OR_OUTDIR_OOD410)\$(@B).dll # Update the version information block -$(OR_OUTDIR)\oodialog.res: $(OR_OODIALOGSRC)\oodialog.rc +$(OR_OUTDIR_OOD410)\oodialog.res: $(OR_OODIALOGSRC_410)\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_common) /i $(OR_OODIALOGSRC_410) /i $(OR_WINKERNELSRC) -r -fo$(OR_OUTDIR_OOD410)\$(@B).res $(OR_OODIALOGSRC_410)\$(@B).rc Modified: sandbox/mark/ooDialog.beta/extensions/platform/windows/oodialog.4.2.0/oodialog.mak =================================================================== --- sandbox/mark/ooDialog.beta/extensions/platform/windows/oodialog.4.2.0/oodialog.mak 2010-11-08 01:04:21 UTC (rev 6373) +++ sandbox/mark/ooDialog.beta/extensions/platform/windows/oodialog.4.2.0/oodialog.mak 2010-11-08 03:07:22 UTC (rev 6374) @@ -40,7 +40,7 @@ # Need to use /Gy when compiling to use /OPT:REF. # NMAKE-compatible MAKE file for ooDialog -all: $(OR_OUTDIR)\oodialog.dll +all: $(OR_OUTDIR_OOD420)\oodialog.dll !include "$(OR_LIBSRC)\ORXWIN32.MAK" C=cl @@ -48,71 +48,71 @@ OR_LIB=$(OR_OUTDIR) # All Source Files -SOURCEF= $(OR_OUTDIR)\APICommon.obj $(OR_OUTDIR)\oodBarControls.obj $(OR_OUTDIR)\oodBaseDialog.obj $(OR_OUTDIR)\oodBasicControls.obj \ - $(OR_OUTDIR)\oodCommon.obj $(OR_OUTDIR)\oodControl.obj $(OR_OUTDIR)\oodData.obj $(OR_OUTDIR)\oodDeviceGraphics.obj \ - $(OR_OUTDIR)\ooDialog.obj $(OR_OUTDIR)\oodMenu.obj $(OR_OUTDIR)\oodMessaging.obj $(OR_OUTDIR)\oodPackageEntry.obj \ - $(OR_OUTDIR)\oodPropertySheetDialog.obj $(OR_OUTDIR)\oodResources.obj $(OR_OUTDIR)\oodRoutines.obj $(OR_OUTDIR)\oodUser.obj \ - $(OR_OUTDIR)\oodUtilities.obj $(OR_OUTDIR)\oodViewControls.obj $(OR_OUTDIR)\oodialog.res +SOURCEF= $(OR_OUTDIR_OOD420)\APICommon.obj $(OR_OUTDIR_OOD420)\oodBarControls.obj $(OR_OUTDIR_OOD420)\oodBaseDialog.obj $(OR_OUTDIR_OOD420)\oodBasicControls.obj \ + $(OR_OUTDIR_OOD420)\oodCommon.obj $(OR_OUTDIR_OOD420)\oodControl.obj $(OR_OUTDIR_OOD420)\oodData.obj $(OR_OUTDIR_OOD420)\oodDeviceGraphics.obj \ + $(OR_OUTDIR_OOD420)\ooDialog.obj $(OR_OUTDIR_OOD420)\oodMenu.obj $(OR_OUTDIR_OOD420)\oodMessaging.obj $(OR_OUTDIR_OOD420)\oodPackageEntry.obj \ + $(OR_OUTDIR_OOD420)\oodPropertySheetDialog.obj $(OR_OUTDIR_OOD420)\oodResources.obj $(OR_OUTDIR_OOD420)\oodRoutines.obj $(OR_OUTDIR_OOD420)\oodUser.obj \ + $(OR_OUTDIR_OOD420)\oodUtilities.obj $(OR_OUTDIR_OOD420)\oodViewControls.obj $(OR_OUTDIR_OOD420)\oodialog.res # All Source files that include APICommon.hpp -APICOMMON_SOURCEF = $(OR_OUTDIR)\APICommon.obj $(OR_OUTDIR)\oodBaseDialog.obj $(OR_OUTDIR)\oodBasicControls.obj \ - $(OR_OUTDIR)\oodCommon.obj $(OR_OUTDIR)\oodControl.obj $(OR_OUTDIR)\oodData.obj \ - $(OR_OUTDIR)\oodDeviceGraphics.obj $(OR_OUTDIR)\ooDialog.obj $(OR_OUTDIR)\oodMenu.obj \ - $(OR_OUTDIR)\oodMessaging.obj $(OR_OUTDIR)\oodPropertySheetDialog.obj $(OR_OUTDIR)\oodRoutines.obj \ - $(OR_OUTDIR)\oodUser.obj $(OR_OUTDIR)\oodUtilities.obj $(OR_OUTDIR)\oodViewControls.obj +APICOMMON_SOURCEF = $(OR_OUTDIR_OOD420)\APICommon.obj $(OR_OUTDIR_OOD420)\oodBaseDialog.obj $(OR_OUTDIR_OOD420)\oodBasicControls.obj \ + $(OR_OUTDIR_OOD420)\oodCommon.obj $(OR_OUTDIR_OOD420)\oodControl.obj $(OR_OUTDIR_OOD420)\oodData.obj \ + $(OR_OUTDIR_OOD420)\oodDeviceGraphics.obj $(OR_OUTDIR_OOD420)\ooDialog.obj $(OR_OUTDIR_OOD420)\oodMenu.obj \ + $(OR_OUTDIR_OOD420)\oodMessaging.obj $(OR_OUTDIR_OOD420)\oodPropertySheetDialog.obj $(OR_OUTDIR_OOD420)\oodRoutines.obj \ + $(OR_OUTDIR_OOD420)\oodUser.obj $(OR_OUTDIR_OOD420)\oodUtilities.obj $(OR_OUTDIR_OOD420)\oodViewControls.obj # All Source files that include oodCommon.hpp -COMMON_SOURCEF = $(OR_OUTDIR)\oodBarControls.obj $(OR_OUTDIR)\oodBaseDialog.obj $(OR_OUTDIR)\oodBasicControls.obj \ - $(OR_OUTDIR)\oodCommon.obj $(OR_OUTDIR)\oodData.obj $(OR_OUTDIR)\oodDeviceGraphics.obj $(OR_OUTDIR)\oodMenu.obj \ - $(OR_OUTDIR)\oodMessaging.obj $(OR_OUTDIR)\oodPropertySheetDialog.obj $(OR_OUTDIR)\oodRoutines.obj \ - $(OR_OUTDIR)\oodUser.obj $(OR_OUTDIR)\oodUtilities.obj $(OR_OUTDIR)\oodViewControls.obj +COMMON_SOURCEF = $(OR_OUTDIR_OOD420)\oodBarControls.obj $(OR_OUTDIR_OOD420)\oodBaseDialog.obj $(OR_OUTDIR_OOD420)\oodBasicControls.obj \ + $(OR_OUTDIR_OOD420)\oodCommon.obj $(OR_OUTDIR_OOD420)\oodData.obj $(OR_OUTDIR_OOD420)\oodDeviceGraphics.obj $(OR_OUTDIR_OOD420)\oodMenu.obj \ + $(OR_OUTDIR_OOD420)\oodMessaging.obj $(OR_OUTDIR_OOD420)\oodPropertySheetDialog.obj $(OR_OUTDIR_OOD420)\oodRoutines.obj \ + $(OR_OUTDIR_OOD420)\oodUser.obj $(OR_OUTDIR_OOD420)\oodUtilities.obj $(OR_OUTDIR_OOD420)\oodViewControls.obj # All Source files that include oodDeviceGraphics.hpp -OODEVICECONTEXT_SOURCEF = $(OR_OUTDIR)\oodBaseDialog.obj $(OR_OUTDIR)\oodControl.cpp $(OR_OUTDIR)\ooDeviceGraphics.cpp \ - $(OR_OUTDIR)\ooDialog.cpp $(OR_OUTDIR)\oodRoutines.obj $(OR_OUTDIR)\oodMessaging.obj \ - $(OR_OUTDIR)\oodPropertySheetDialog.obj $(OR_OUTDIR)\oodUser.obj $(OR_OUTDIR)\oodUtilities.obj +OODEVICECONTEXT_SOURCEF = $(OR_OUTDIR_OOD420)\oodBaseDialog.obj $(OR_OUTDIR_OOD420)\oodControl.cpp $(OR_OUTDIR_OOD420)\ooDeviceGraphics.cpp \ + $(OR_OUTDIR_OOD420)\ooDialog.cpp $(OR_OUTDIR_OOD420)\oodRoutines.obj $(OR_OUTDIR_OOD420)\oodMessaging.obj \ + $(OR_OUTDIR_OOD420)\oodPropertySheetDialog.obj $(OR_OUTDIR_OOD420)\oodUser.obj $(OR_OUTDIR_OOD420)\oodUtilities.obj # All Source files that include oodData.hpp -OODDATA_SOURCEF = $(OR_OUTDIR)\oodBaseDialog.obj $(OR_OUTDIR)\ooDialog.cpp $(OR_OUTDIR)\oodData.obj $(OR_OUTDIR)\oodMessaging.obj \ - $(OR_OUTDIR)\oodPropertySheetDialog.obj $(OR_OUTDIR)\oodUser.obj +OODDATA_SOURCEF = $(OR_OUTDIR_OOD420)\oodBaseDialog.obj $(OR_OUTDIR_OOD420)\ooDialog.cpp $(OR_OUTDIR_OOD420)\oodData.obj $(OR_OUTDIR_OOD420)\oodMessaging.obj \ + $(OR_OUTDIR_OOD420)\oodPropertySheetDialog.obj $(OR_OUTDIR_OOD420)\oodUser.obj # All Source files that include oodControl.hpp -OODCONTROL_SOURCEF = $(OR_OUTDIR)\oodBarControls.obj $(OR_OUTDIR)\oodBaseDialog.obj $(OR_OUTDIR)\oodBasicControls.obj \ - $(OR_OUTDIR)\oodControl.obj $(OR_OUTDIR)\oodData.obj $(OR_OUTDIR)\ooDialog.cpp \ - $(OR_OUTDIR)\oodPropertySheetDialog.obj $(OR_OUTDIR)\oodUser.obj $(OR_OUTDIR)\oodViewControls.obj +OODCONTROL_SOURCEF = $(OR_OUTDIR_OOD420)\oodBarControls.obj $(OR_OUTDIR_OOD420)\oodBaseDialog.obj $(OR_OUTDIR_OOD420)\oodBasicControls.obj \ + $(OR_OUTDIR_OOD420)\oodControl.obj $(OR_OUTDIR_OOD420)\oodData.obj $(OR_OUTDIR_OOD420)\ooDialog.cpp \ + $(OR_OUTDIR_OOD420)\oodPropertySheetDialog.obj $(OR_OUTDIR_OOD420)\oodUser.obj $(OR_OUTDIR_OOD420)\oodViewControls.obj # All Source files that include oodMessaging.hpp -OODMESSAGING_SOURCEF = $(OR_OUTDIR)\oodBaseDialog.obj $(OR_OUTDIR)\oodControl.obj $(OR_OUTDIR)\oodDeviceGraphics.obj \ - $(OR_OUTDIR)\ooDialog.obj $(OR_OUTDIR)\oodMenu.obj $(OR_OUTDIR)\oodMessaging.obj \ - $(OR_OUTDIR)\oodPropertySheetDialog.obj $(OR_OUTDIR)\oodUser.obj +OODMESSAGING_SOURCEF = $(OR_OUTDIR_OOD420)\oodBaseDialog.obj $(OR_OUTDIR_OOD420)\oodControl.obj $(OR_OUTDIR_OOD420)\oodDeviceGraphics.obj \ + $(OR_OUTDIR_OOD420)\ooDialog.obj $(OR_OUTDIR_OOD420)\oodMenu.obj $(OR_OUTDIR_OOD420)\oodMessaging.obj \ + $(OR_OUTDIR_OOD420)\oodPropertySheetDialog.obj $(OR_OUTDIR_OOD420)\oodUser.obj # All Source files that include oodResources.hpp -OODRESOURCES_SOURCEF = $(OR_OUTDIR)\oodBasicControls.obj $(OR_OUTDIR)\oodPropertySheetDialog.obj $(OR_OUTDIR)\oodResources.obj \ - $(OR_OUTDIR)\oodViewControls.obj +OODRESOURCES_SOURCEF = $(OR_OUTDIR_OOD420)\oodBasicControls.obj $(OR_OUTDIR_OOD420)\oodPropertySheetDialog.obj $(OR_OUTDIR_OOD420)\oodResources.obj \ + $(OR_OUTDIR_OOD420)\oodViewControls.obj # All Source files that include oodUser.hpp -OODUSER_SOURCEF = $(OR_OUTDIR)\oodPropertySheetDialog.obj $(OR_OUTDIR)\oodUser.obj +OODUSER_SOURCEF = $(OR_OUTDIR_OOD420)\oodPropertySheetDialog.obj $(OR_OUTDIR_OOD420)\oodUser.obj -.c{$(OR_OUTDIR)}.obj: - $(C) $(OPTIONS) /DINCL_32 -c $(@B).c /Fo$(OR_OUTDIR)\$(@B).obj +.c{$(OR_OUTDIR_OOD420)}.obj: + $(C) $(OPTIONS) /DINCL_32 -c $(@B).c /Fo$(OR_OUTDIR_OOD420)\$(@B).obj # # *** .cpp -> .obj rules # -{$(OR_OODIALOGSRC)}.cpp{$(OR_OUTDIR)}.obj: +{$(OR_OODIALOGSRC_420)}.cpp{$(OR_OUTDIR_OOD420)}.obj: @ECHO . @ECHO Compiling $(@B).cpp - $(OR_CC) $(cflags_common) $(cflags_dll) /Fo$(OR_OUTDIR)\$(@B).obj $(OR_ORYXINCL) $(OR_OODIALOGSRC)\$(@B).cpp + $(OR_CC) $(cflags_common) $(cflags_dll) /Fo$(OR_OUTDIR_OOD420)\$(@B).obj $(OR_ORYXINCL) $(OR_OODIALOGSRC_420)\$(@B).cpp -{$(OR_OODIALOGSRC)}.c{$(OR_OUTDIR)}.obj: +{$(OR_OODIALOGSRC_420)}.c{$(OR_OUTDIR_OOD420)}.obj: @ECHO . @ECHO Compiling $(@B).c - $(OR_CC) $(cflags_common) $(cflags_dll) /Fo$(OR_OUTDIR)\$(@B).obj $(OR_ORYXINCL) $(OR_OODIALOGSRC)\$(@B).c + $(OR_CC) $(cflags_common) $(cflags_dll) /Fo$(OR_OUTDIR_OOD420)\$(@B).obj $(OR_ORYXINCL) $(OR_OODIALOGSRC_420)\$(@B).c -$(OR_OUTDIR)\oodialog.dll: $(SOURCEF) +$(OR_OUTDIR_OOD420)\oodialog.dll: $(SOURCEF) $(OR_LINK) \ $(SOURCEF) \ $(lflags_common) $(lflags_dll) \ @@ -122,15 +122,15 @@ COMDLG32.LIB \ COMCTL32.LIB \ shlwapi.lib \ - -def:$(OR_OODIALOGSRC)\ooDialog.def \ - -out:$(OR_OUTDIR)\$(@B).dll + -def:$(OR_OODIALOGSRC_420)\ooDialog.def \ + -out:$(OR_OUTDIR_OOD420)\$(@B).dll # Update the version information block -$(OR_OUTDIR)\oodialog.res: $(OR_OODIALOGSRC)\oodialog.rc +$(OR_OUTDIR_OOD420)\oodialog.res: $(OR_OODIALOGSRC_420)\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_common) /i $(OR_OODIALOGSRC_420) /i $(OR_WINKERNELSRC) -r -fo$(OR_OUTDIR_OOD420)\$(@B).res $(OR_OODIALOGSRC_420)\$(@B).rc # Recompile everything if the make file changes. $(SOURCEF) : oodialog.mak @@ -145,4 +145,4 @@ $(OODMESSAGING_SOURCEF) : oodMessaging.hpp $(OODRESOURCES_SOURCEF) : oodResources.hpp $(OODUSER_SOURCEF) : oodUser.hpp -$(OR_OUTDIR)\oodMenu.obj : oodMenu.hpp +$(OR_OUTDIR_OOD420)\oodMenu.obj : oodMenu.hpp Modified: sandbox/mark/ooDialog.beta/makeorx.bat =================================================================== --- sandbox/mark/ooDialog.beta/makeorx.bat 2010-11-08 01:04:21 UTC (rev 6373) +++ sandbox/mark/ooDialog.beta/makeorx.bat 2010-11-08 03:07:22 UTC (rev 6374) @@ -96,11 +96,13 @@ SET BLDRELEASE=1 GOTO STARTBUILD -REM If we are building BOTH, we need to reset the log name and API output -REM directory. We just set them unconditionally. +REM If we are building BOTH, we need to reset the log name and the output +REM directories. We just set them unconditionally. :BLDDEBUG set OR_OUTDIR=%SRC_DRV%%SRC_DIR%\Win32Dbg -set OR_OUTDIR_API=%SRC_DRV%%SRC_DIR%\Win32Dbg\api +set OR_OUTDIR_API=%OR_OUTDIR%\api +set OR_OUTDIR_OOD410=%OR_OUTDIR%\oodialog410 +set OR_OUTDIR_OOD420=%OR_OUTDIR%\oodialog420 set OR_ERRLOG=%OR_OUTDIR%\Win32Dbg.log if %USELOGFILE% EQU 1 ( @@ -497,9 +499,13 @@ IF %DOPACKAGE% == 1 SET PACKAGE_REL=1 set OR_OUTDIR=%SRC_DRV%%SRC_DIR%\Win32Rel set OR_OUTDIR_API=%OR_OUTDIR%\api +set OR_OUTDIR_OOD410=%OR_OUTDIR%\oodialog410 +set OR_OUTDIR_OOD420=%OR_OUTDIR%\oodialog420 set OR_ERRLOG=%OR_OUTDIR%\Win32Rel.log if not exist %OR_OUTDIR% md %OR_OUTDIR% if not exist %OR_OUTDIR_API% md %OR_OUTDIR_API% +if not exist %OR_OUTDIR_OOD410% md %OR_OUTDIR_OOD410% +if not exist %OR_OUTDIR_OOD420% md %OR_OUTDIR_OOD420% GOTO BUILD_CHECK_DONE @@ -514,18 +520,21 @@ IF %DOPACKAGE% == 1 SET PACKAGE_DBG=1 set OR_OUTDIR=%SRC_DRV%%SRC_DIR%\Win32Dbg set OR_OUTDIR_API=%OR_OUTDIR%\api +set OR_OUTDIR_OOD410=%OR_OUTDIR%\oodialog410 +set OR_OUTDIR_OOD420=%OR_OUTDIR%\oodialog420 set OR_ERRLOG=%OR_OUTDIR%\Win32Dbg.log if not exist %OR_OUTDIR% md %OR_OUTDIR% if not exist %OR_OUTDIR_API% md %OR_OUTDIR_API% +if not exist %OR_OUTDIR_OOD410% md %OR_OUTDIR_OOD410% +if not exist %OR_OUTDIR_OOD420% md %OR_OUTDIR_OOD420% GOTO BUILD_CHECK_DONE REM - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - REM :DOBOTH REM Sets the variables to do both non-debug and debug builds. We will create -REM all output directories if needed. The log name and API out directory -REM will first be used in the non-debug build. Then corrected in the debug -REM build. +REM all output directories if needed. The log name and out directories will +REM first be used in the non-debug build. Then corrected in the debug build. REM - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - :DO_BOTH set MKNODEBUG=1 @@ -536,11 +545,15 @@ ) set OR_OUTDIR=%SRC_DRV%%SRC_DIR%\Win32Rel set OR_OUTDIR_API=%OR_OUTDIR%\api +set OR_OUTDIR_OOD410=%OR_OUTDIR%\oodialog410 +set OR_OUTDIR_OOD420=%OR_OUTDIR%\oodialog420 set OR_ERRLOG=%SRC_DRV%%SRC_DIR%\Win32Rel\Win32Rel.log if not exist %OR_OUTDIR% md %OR_OUTDIR% if not exist %OR_OUTDIR_API% md %OR_OUTDIR_API% if not exist %SRC_DRV%%SRC_DIR%\Win32Dbg md %SRC_DRV%%SRC_DIR%\Win32Dbg if not exist %SRC_DRV%%SRC_DIR%\Win32Dbg\api md %SRC_DRV%%SRC_DIR%\Win32Dbg\api +if not exist %SRC_DRV%%SRC_DIR%\Win32Dbg\oodialog410 md %SRC_DRV%%SRC_DIR%\Win32Dbg\oodialog410 +if not exist %SRC_DRV%%SRC_DIR%\Win32Dbg\oodialog420 md %SRC_DRV%%SRC_DIR%\Win32Dbg\oodialog420 GOTO BUILD_CHECK_DONE Modified: sandbox/mark/ooDialog.beta/orxdb.bat =================================================================== --- sandbox/mark/ooDialog.beta/orxdb.bat 2010-11-08 01:04:21 UTC (rev 6373) +++ sandbox/mark/ooDialog.beta/orxdb.bat 2010-11-08 03:07:22 UTC (rev 6374) @@ -42,18 +42,8 @@ IF %OR_ERRLOG%x == x GOTO HELP_LOG REM -REM set up the directories for the generated files +REM set up the varialbles for the source file direcotories REM -REM set OR_OUTDIR=O:\TESTDIR -if (%1)==(1) goto release -set OR_OUTDIR=%SRC_DRV%%SRC_DIR%\Win32Dbg -goto cont -:release -set OR_OUTDIR=%SRC_DRV%%SRC_DIR%\Win32Rel -:cont -REM -REM set up the directories for the source files -REM set OR_REXXUTILSRC=%SRC_DRV%%SRC_DIR%\rexutils set XPLATFORM=%OR_REXXUTILSRC%\windows set OR_MAINSRC=%SRC_DRV%%SRC_DIR% @@ -66,13 +56,17 @@ set OR_MESSAGESRC=%SRC_DRV%%SRC_DIR%\interpreter\messages set OR_WINKERNELSRC=%SRC_DRV%%SRC_DIR%\platform\windows set OR_REXXAPISRC=%SRC_DRV%%SRC_DIR%\rexxapi -set OR_OODIALOGSRC=%SRC_DRV%%SRC_DIR%\extensions\platform\windows\oodialog + +set OR_OODIALOGSRC_410=%SRC_DRV%%SRC_DIR%\extensions\platform\windows\oodialog.4.1.0 +set OR_OODIALOGSRC_420=%SRC_DRV%%SRC_DIR%\extensions\platform\windows\oodialog.4.2.0 +set OR_OODIALOGSAMPLES410=%SRC_DRV%%SRC_DIR%\samples\windows\oodialog.4.1.0 +set OR_OODIALOGSAMPLES420=%SRC_DRV%%SRC_DIR%\samples\windows\oodialog.4.2.0 + set OR_OLEOBJECTSRC=%SRC_DRV%%SRC_DIR%\extensions\platform\windows\ole set OR_ORXSCRIPTSRC=%SRC_DRV%%SRC_DIR%\extensions\platform\windows\orxscrpt set OR_REGEXPSRC=%SRC_DRV%%SRC_DIR%\extensions\rxregexp set OR_SAMPLESRC=%SRC_DRV%%SRC_DIR%\samples set OR_APISAMPLESRC=%SRC_DRV%%SRC_DIR%\samples\windows\api -set OR_OODIALOGSAMPLES=%SRC_DRV%%SRC_DIR%\samples\windows\oodialog set OR_UTILITIES=%SRC_DRV%%SRC_DIR%\utilities set OR_EXTENSIONS=%SRC_DRV%%SRC_DIR%\extensions set OR_HOSTEMUSRC=%OR_EXTENSIONS%\hostemu @@ -101,7 +95,7 @@ REM REM set up the directory search orders for the source include files REM -set OR_ORYXINCL=-I%OR_LIBSRC%\ -I%OR_COMMONSRC%\ -I%OR_COMMONPLATFORMSRC%\ -I%OR_APISRC%\ -I%OR_APIWINSRC%\ %OR_INTERPRETERINCL% -I%OR_WINKERNELSRC%\ -I%XPLATFORM% -I%OR_OODIALOGSRC%\ -I%OR_ORYXFSRC%\ -I%OR_OLEOBJECTSRC%\ -I%OR_ORXSCRIPTSRC%\ -I%OR_MESSAGESRC%\ -I%OR_HOSTEMUSRC%\ +set OR_ORYXINCL=-I%OR_LIBSRC%\ -I%OR_COMMONSRC%\ -I%OR_COMMONPLATFORMSRC%\ -I%OR_APISRC%\ -I%OR_APIWINSRC%\ %OR_INTERPRETERINCL% -I%OR_WINKERNELSRC%\ -I%XPLATFORM% -I%OR_ORYXFSRC%\ -I%OR_OLEOBJECTSRC%\ -I%OR_ORXSCRIPTSRC%\ -I%OR_MESSAGESRC%\ -I%OR_HOSTEMUSRC%\ set OR_ORYXRCINCL=-I%INTERPRETER_MESSAGES% REM REM set up the search order for the dependency list @@ -120,9 +114,7 @@ set NOCRTDLL=1 set REXXDEBUG=0 -REM create output directory -if not exist %OR_OUTDIR% md %OR_OUTDIR% - +REM create output ASM directory if needed IF NOT %MKASM%==1 GOTO :build if not exist %OR_OUTDIR%\ASM md %OR_OUTDIR%\ASM Modified: sandbox/mark/ooDialog.beta/platform/windows/buildorx.bat =================================================================== --- sandbox/mark/ooDialog.beta/platform/windows/buildorx.bat 2010-11-08 01:04:21 UTC (rev 6373) +++ sandbox/mark/ooDialog.beta/platform/windows/buildorx.bat 2010-11-08 03:07:22 UTC (rev 6374) @@ -169,17 +169,24 @@ REM *** oodialog REM -@ECHO Building OODIALOG.. -CD %OR_OODIALOGSRC% -IF %USELOGFILE% equ 1 ( NMAKE /F OODIALOG.MAK >>%OR_ERRLOG% 2>&1 ) else ( NMAKE /F OODIALOG.MAK ) +@ECHO Building ooDialog, both versions ... +CD %OR_OODIALOGSRC_410% +IF %USELOGFILE% equ 1 ( NMAKE /F oodialog.mak >>%OR_ERRLOG% 2>&1 ) else ( NMAKE /F oodialog.mak ) if ERRORLEVEL 1 goto error +CD %OR_OODIALOGSRC_420% +IF %USELOGFILE% equ 1 ( NMAKE /F oodialog.mak >>%OR_ERRLOG% 2>&1 ) else ( NMAKE /F oodialog.mak ) +if ERRORLEVEL 1 goto error -ECHO Building OODIALOG classes +ECHO Building ooDialog classes, both versions ... CD %OR_OUTDIR% -IF %USELOGFILE% equ 1 ( REXX %OR_OODIALOGSRC%\M_OODCLS.REX >>%OR_ERRLOG% 2>&1 ) else ( REXX %OR_OODIALOGSRC%\M_OODCLS.REX ) +IF %USELOGFILE% equ 1 ( REXX %OR_OODIALOGSRC_410%\M_OODCLS.REX >>%OR_ERRLOG% 2>&1 ) else ( REXX %OR_OODIALOGSRC_410%\M_OODCLS.REX ) if ERRORLEVEL 1 goto error +move ood*cls %OR_OUTDIR_OOD410% +IF %USELOGFILE% equ 1 ( REXX %OR_OODIALOGSRC_420%\build_ooDialog_cls.rex >>%OR_ERRLOG% 2>&1 ) else ( REXX %OR_OODIALOGSRC_420%\build_ooDialog_cls.rex ) +if ERRORLEVEL 1 goto error +move ood*cls %OR_OUTDIR_OOD420% CD %SRC_DIR% @@ -221,10 +228,14 @@ if ERRORLEVEL 1 goto error @ECHO Building OODialog Samples.. -CD %OR_OODIALOGSAMPLES%\res +CD %OR_OODIALOGSAMPLES410%\res IF %USELOGFILE% equ 1 ( NMAKE /F res.mak >>%OR_ERRLOG% 2>&1 ) else ( NMAKE /F res.mak ) if ERRORLEVEL 1 goto error +CD %OR_OODIALOGSAMPLES420%\res +IF %USELOGFILE% equ 1 ( NMAKE /F res.mak >>%OR_ERRLOG% 2>&1 ) else ( NMAKE /F res.mak ) +if ERRORLEVEL 1 goto error + goto arounderr :error This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |