0023715: Generated cmake files should link against Cocoa on Mac OS X

Collect scripts refactored
Unused variable SYSTEM was removed.
LIN macro no more defined for Mac OS target.
HAVE_CONFIG_H no more defined for Windows target.
Appended Mac OS X frameworks.
Do not append empty entries to LD_LIBRARY_PATH in "env.sh"

0023724: Add -MP option to generated VS project files

diff --git a/.gitignore b/.gitignore
index 071f26c537801105ad7f424009d511dbb5a5b0b6..1b5852537c63432fb3153a7d5d593976c4c92f0b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@
 # /adm/
 /adm/win32
 /adm/win64
+/adm/cmake
+
+/package

diff --git a/collect_binary.bat b/collect_binary.bat
index ab2a8043d5d8006d7c680fede4aa42158fb7c720..f47117774806ad38a2132637956176afc256a142 100644 (file)
--- a/collect_binary.bat
+++ b/collect_binary.bat
@@ -145,333 +145,7 @@ if exist "%~dp0win%ARCH%\%VCVER%\bin%CASDEB%" (
 xcopy "%~dp0%preDLLPath%\*.dll" "%installPath%\lib\wnt\"
 if not %errorlevel%. == 0. (set "doNotCopyForeignFileList=bin *.dll")
 
-mkdir "%installPath%\wok_entities\"
-
-mkdir "%installPath%\3rdparty\"
-mkdir "%installPath%\3rdparty\win32\"
-mkdir "%installPath%\3rdparty\win32\codegen\"
-mkdir "%installPath%\3rdparty\win32\Emacs\"
-mkdir "%installPath%\3rdparty\win32\tcltk\"
-mkdir "%installPath%\3rdparty\win32\utils\"
-
-
-xcopy "src\WOKsite\tclshrc.tcl"    "%installPath%\home\"
-xcopy "src\WOKsite\.emacs"    "%installPath%\home\"
-xcopy "src\WOKsite\.emacs"    "%installPath%\home\"
-
-xcopy "src\WOKsite\public_el" "%installPath%\site\public_el\" /S
-xcopy "custom.bat" "%installPath%\site\"
-
-xcopy "src\CPPJini\CPPJini_General.edl" "%installPath%\lib\"
-xcopy "src\CPPJini\CPPJini_Template.edl" "%installPath%\lib\"
-
-xcopy "src\WOKOBJS\OBJS.edl" "%installPath%\lib\"
-xcopy "src\WOKOBJS\OBJSSCHEMA.edl" "%installPath%\lib\"
-
-xcopy "src\WOKLibs\pkgIndex.tcl" "%installPath%\lib\"
-
-xcopy "src\TCPPExt\TCPPExt_MethodTemplate.edl" "%installPath%\lib\"
-
-xcopy "src\WOKDeliv\WOKDeliv_DelivExecSource.tcl" "%installPath%\lib\"
-xcopy "src\WOKDeliv\WOKDeliv_FRONTALSCRIPT.edl" "%installPath%\lib\"
-xcopy "src\WOKDeliv\WOKDeliv_LDSCRIPT.edl" "%installPath%\lib\"
-
-xcopy "src\CSFDBSchema\CSFDBSchema_Template.edl" "%installPath%\lib\"
-
-xcopy "src\WOKUtils\EDL.edl" "%installPath%\lib\"
-
-xcopy "src\CPPIntExt\Engine_Template.edl" "%installPath%\lib\"
-xcopy "src\CPPIntExt\Interface_Template.edl" "%installPath%\lib\"
-
-xcopy "src\WOKTclTools\ENV.edl" "%installPath%\lib\"
-
-xcopy "src\WOKEntityDef\FILENAME.edl" "%installPath%\lib\"
-
-xcopy "src\CPPExt\CPPExt_Standard.edl" "%installPath%\lib\"
-xcopy "src\CPPExt\CPPExt_Template.edl" "%installPath%\lib\"
-xcopy "src\CPPExt\CPPExt_TemplateCSFDB.edl" "%installPath%\lib\"
-xcopy "src\CPPExt\CPPExt_TemplateOBJS.edl" "%installPath%\lib\"
-xcopy "src\CPPExt\CPPExt_TemplateOBJY.edl" "%installPath%\lib\"
-
-
-xcopy "src\WOKOrbix\IDLFRONT.edl" "%installPath%\lib\"
-xcopy "src\WOKOrbix\ORBIX.edl" "%installPath%\lib\"
-xcopy "src\WOKOrbix\WOKOrbix_ClientObjects.tcl" "%installPath%\lib\"
-xcopy "src\WOKOrbix\WOKOrbix_ServerObjects.tcl" "%installPath%\lib\"
-
-xcopy "src\WOKEntityDef\WOKEntity.edl" "%installPath%\lib\"
-xcopy "src\WOKEntityDef\WOKEntity_Factory.edl" "%installPath%\lib\"
-xcopy "src\WOKEntityDef\WOKEntity_Parcel.edl" "%installPath%\lib\"
-xcopy "src\WOKEntityDef\WOKEntity_ParcelUnit.edl" "%installPath%\lib\"
-xcopy "src\WOKEntityDef\WOKEntity_Unit.edl" "%installPath%\lib\"
-xcopy "src\WOKEntityDef\WOKEntity_UnitTypes.edl" "%installPath%\lib\"
-xcopy "src\WOKEntityDef\WOKEntity_Warehouse.edl" "%installPath%\lib\"
-xcopy "src\WOKEntityDef\WOKEntity_Workbench.edl" "%installPath%\lib\"
-xcopy "src\WOKEntityDef\WOKEntity_WorkbenchUnit.edl" "%installPath%\lib\"
-xcopy "src\WOKEntityDef\WOKEntity_Workshop.edl" "%installPath%\lib\"
-
-xcopy "src\WOKStep\WOKStep_frontal.tcl" "%installPath%\lib\"
-xcopy "src\WOKStep\WOKStep_JavaCompile.tcl" "%installPath%\lib\"
-xcopy "src\WOKStep\WOKStep_JavaHeader.tcl" "%installPath%\lib\"
-xcopy "src\WOKStep\WOKStep_LibRename.tcl" "%installPath%\lib\"
-xcopy "src\WOKStep\WOKStep_ManifestEmbed.tcl" "%installPath%\lib\"
-xcopy "src\WOKStep\WOKStep_TclLibIdep.tcl" "%installPath%\lib\"
-
-
-xcopy "src\WOKStepsDef\FRONTAL.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_ccl.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_client.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_client_wnt.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_Del.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_delivery.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_documentation.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_engine.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_engine_wnt.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_executable.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_executable_wnt.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_frontal.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_idl.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_interface.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_interface_wnt.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_jini.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_nocdlpack.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_nocdlpack_wnt.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_package.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_package_wnt.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_resource.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_schema.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_schema_DFLT.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_schema_OBJS.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_schema_OBJY.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_server.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_toolkit.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKSteps_toolkit_wnt.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKStepsDeliv.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKStepsDFLT.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKStepsOBJS.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKStepsOBJY.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKStepsOrbix.edl" "%installPath%\lib\"
-xcopy "src\WOKStepsDef\WOKStepsStep.edl" "%installPath%\lib\"
-
-xcopy "src\WOKsite\wok.csh" "%installPath%\site\"
-xcopy "src\WOKsite\wokinit.csh" "%installPath%\site\"
-xcopy "src\WOKsite\DEFAULT.edl" "%installPath%\site\"
-xcopy "src\WOKsite\WOKSESSION.edl" "%installPath%\site\"
-xcopy "src\WOKsite\CreateFactory.tcl" "%installPath%\site\"
-xcopy "src\WOKsite\interp.tcl" "%installPath%\site\"
-xcopy "src\WOKsite\tclshrc.tcl" "%installPath%\site\"
-xcopy "src\WOKsite\wok_deps.tcl" "%installPath%\site\"
-xcopy "src\WOKsite\wok_depsgui.tcl" "%installPath%\site\"
-xcopy "src\WOKsite\wok_tclshrc.tcl" "%installPath%\site\"
-xcopy "src\WOKsite\wok.bat" "%installPath%\site\"
-xcopy "src\WOKsite\wok_confgui.bat" "%installPath%\site\"
-xcopy "src\WOKsite\wok_emacs.bat" "%installPath%\site\"
-xcopy "src\WOKsite\wok_env.bat" "%installPath%\site\"
-xcopy "src\WOKsite\wok_init.bat" "%installPath%\site\"
-xcopy "src\WOKsite\wok_tclsh.bat" "%installPath%\site\"
-xcopy "src\WOKsite\wokinit.bat" "%installPath%\site\"
-
-xcopy "src\CPPClient\CPPClient_General.edl" "%installPath%\lib\"
-xcopy "src\CPPClient\CPPClient_Template.edl" "%installPath%\lib\"
-
-
-rem from WOKBuilderDef to lib folder
-xcopy "src\WOKBuilderDef\ARX.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CDLTranslate.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CMPLRS.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CMPLRS_AIX.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CMPLRS_BSD.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CMPLRS_HP.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CMPLRS_LIN.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CMPLRS_MAC.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CMPLRS_SIL.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CMPLRS_SUN.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CMPLRS_WNT.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CODEGEN.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\COMMAND.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CPP.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CPPCLIENT.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CPPENG.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CPPINT.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CPPJINI.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CSF.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CSF_AIX.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CSF_AO1.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CSF_BSD.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CSF_HP.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CSF_LIN.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CSF_MAC.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CSF_SIL.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CSF_SUN.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CSF_WNT.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\CSFDBSCHEMA.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\JAVA.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\LD.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\LDAR.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\LDEXE.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\LDSHR.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\LIB.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\LINK.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\LINKSHR.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\STUBS.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\TCPP.edl" "%installPath%\lib\"
-xcopy "src\WOKBuilderDef\USECONFIG.edl" "%installPath%\lib\"
-
-rem WOKTclLib to lib
-xcopy "src\WOKTclLib\templates" "%installPath%\lib\templates" /i
-xcopy "src\WOKTclLib\abstract.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\admin.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\arb.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\back.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\Browser.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\browser.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\BrowserOMT.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\BrowserSearch.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\bycol.xbm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\bylast.xbm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\bylong.xbm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\byrow.xbm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\caution.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\cback.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\ccl.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\ccl_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\cell.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\cfrwd.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\client.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\client_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\config.h" "%installPath%\lib\"
-xcopy "src\WOKTclLib\create.xpm" "%installPath%\site\"
-xcopy "src\WOKTclLib\danger.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\delete.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\delivery.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\delivery_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\dep.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\documentation.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\documentation_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\engine.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\engine_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\envir.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\envir_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\executable.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\executable_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\factory.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\factory_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\file.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\FILES" "%installPath%\lib\"
-xcopy "src\WOKTclLib\frontal.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\frontal_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\gettable.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\idl.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\idl_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\interface.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\interface_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\jini.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\jini_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\journal.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\MkBuild.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\news_cpwb.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\nocdlpack.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\nocdlpack_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\notes.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\OCCTDocumentation.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\OCCTProductsDocumentation.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\OCCTDocumentationProcedures.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\OCCTGetVersion.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\opencascade.gif" "%installPath%\lib\"
-xcopy "src\WOKTclLib\OS.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\osutils.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\package.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\package_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\params.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\parcel.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\parcel_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\patch.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\patches.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\path.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\persistent.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\pqueue.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\prepare.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\private.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\queue.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\README" "%installPath%\lib\"
-xcopy "src\WOKTclLib\reposit.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\resource.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\resource_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\rotate.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\scheck.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\schema.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\schema_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\see.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\see_closed.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\server.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\server_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\source.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\storable.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\tclx.nt" "%installPath%\lib\"
-xcopy "src\WOKTclLib\tclIndex" "%installPath%\lib\"
-xcopy "src\WOKTclLib\textfile_adm.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\textfile_rdonly.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\toolkit.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\toolkit_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\transient.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\ud2cvs_unix" "%installPath%\lib\"
-xcopy "src\WOKTclLib\unit.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\unit_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\unit_rdonly.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\upack.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\VC.example" "%installPath%\lib\"
-xcopy "src\WOKTclLib\warehouse.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wbuild.hlp" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wbuild.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wbuild.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wcheck.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wcompare.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\WCOMPATIBLE.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wnews.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wnews_trigger.example" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wok.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wok-comm.el" "%installPath%\lib\"
-xcopy "src\WOKTclLib\Wok_Init.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokcd.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokclient.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokCOO.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokCreations.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokcvs.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokDeletions.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokEDF.hlp" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokEDF.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokemacs.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokinit.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokinterp.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokMainHelp.hlp" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokNAV.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokPrepareHelp.hlp" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokPRM.hlp" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokPRM.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokprocs.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokPROP.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokQUE.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokRPR.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokRPRHelp.hlp" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokSEA.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\woksh.el" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokStuff.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\WOKVC.NOBASE" "%installPath%\lib\"
-xcopy "src\WOKTclLib\WOKVC.RCS" "%installPath%\lib\"
-xcopy "src\WOKTclLib\WOKVC.SCCS" "%installPath%\lib\"
-xcopy "src\WOKTclLib\WOKVC.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wokWaffQueueHelp.hlp" "%installPath%\lib\"
-xcopy "src\WOKTclLib\work.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\workbench.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\workbench_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\workbenchq.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\workshop.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\workshop_open.xpm" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wprepare.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wstore.tcl" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wstore_trigger.example" "%installPath%\lib\"
-xcopy "src\WOKTclLib\wutils.tcl" "%installPath%\lib\"
+call "%~dp0collect_binary_without_libs.bat" %installPath%
 
 echo.
 echo =========end operation===========

diff --git a/collect_binary.sh b/collect_binary.sh
index f7e67d99b11108e361ef681ba243dfc3588dd439..33b8e088348f3b9787ca2e50f63ca0c3ccaaa3f7 100644 (file)
--- a/collect_binary.sh
+++ b/collect_binary.sh
@@ -4,8 +4,6 @@
 # $2 - compiler name
 # $3 - related package name
 
-configFile="collect_binary.cfg"
-
 installRelatePath="package"
 if [ "$3" != "" ]; then
   installRelatePath=$3
@@ -20,12 +18,7 @@ fi
 # # Setup environment
 source ./env.sh "$1"
 
-mkdir -p $installRelatePath/doc
-mkdir -p $installRelatePath/lib/lin
-mkdir -p $installRelatePath/lib/templates
-mkdir -p $installRelatePath/home
-mkdir -p $installRelatePath/site/public_el/
-mkdir -p $installRelatePath/wok_entities
+source ./collect_binary_without_libs.sh $installRelatePath
 
 mkdir -p $installRelatePath/3rdparty/lin${ARCH}/codegen
 mkdir -p $installRelatePath/3rdparty/lin${ARCH}/tcltk
@@ -49,328 +42,4 @@ if [ -d "$preWOKLibPath" ]; then
   cp -f -R "$preWOKLibPath/*" $installRelatePath/lib/lin/
 else
   echo "$preWOKLibPath folder DOES NOT exist! "
-fi
-
-cp -f src/WOKsite/tclshrc.tcl     $installRelatePath/home/
-cp -f src/WOKsite/.emacs          $installRelatePath/home/
-cp -f src/WOKsite/.tclshrc        $installRelatePath/home/
-
-cp -f -R src/WOKsite/public_el/* $installRelatePath/site/public_el/
-cp -f custom.sh $installRelatePath/site/
-
-cp -f src/CPPJini/CPPJini_General.edl $installRelatePath/lib/
-cp -f src/CPPJini/CPPJini_Template.edl $installRelatePath/lib/
-
-cp -f src/WOKOBJS/OBJS.edl $installRelatePath/lib/
-cp -f src/WOKOBJS/OBJSSCHEMA.edl $installRelatePath/lib/
-
-cp -f src/WOKLibs/pkgIndex.tcl $installRelatePath/lib/
-
-cp -f src/TCPPExt/TCPPExt_MethodTemplate.edl $installRelatePath/lib/
-
-cp -f src/WOKDeliv/WOKDeliv_DelivExecSource.tcl $installRelatePath/lib/
-cp -f src/WOKDeliv/WOKDeliv_FRONTALSCRIPT.edl $installRelatePath/lib/
-cp -f src/WOKDeliv/WOKDeliv_LDSCRIPT.edl $installRelatePath/lib/
-
-cp -f src/CSFDBSchema/CSFDBSchema_Template.edl $installRelatePath/lib/
-
-cp -f src/WOKUtils/EDL.edl $installRelatePath/lib/
-
-cp -f src/CPPIntExt/Engine_Template.edl $installRelatePath/lib/
-cp -f src/CPPIntExt/Interface_Template.edl $installRelatePath/lib/
-
-cp -f src/WOKTclTools/ENV.edl $installRelatePath/lib/
-
-cp -f src/WOKEntityDef/FILENAME.edl $installRelatePath/lib/
-
-cp -f src/CPPExt/CPPExt_Standard.edl $installRelatePath/lib/
-cp -f src/CPPExt/CPPExt_Template.edl $installRelatePath/lib/
-cp -f src/CPPExt/CPPExt_TemplateCSFDB.edl $installRelatePath/lib/
-cp -f src/CPPExt/CPPExt_TemplateOBJS.edl $installRelatePath/lib/
-cp -f src/CPPExt/CPPExt_TemplateOBJY.edl $installRelatePath/lib/
-
-cp -f src/WOKOrbix/IDLFRONT.edl $installRelatePath/lib/
-cp -f src/WOKOrbix/ORBIX.edl $installRelatePath/lib/
-cp -f src/WOKOrbix/WOKOrbix_ClientObjects.tcl $installRelatePath/lib/
-cp -f src/WOKOrbix/WOKOrbix_ServerObjects.tcl $installRelatePath/lib/
-
-cp -f src/WOKEntityDef/WOKEntity.edl $installRelatePath/lib/
-cp -f src/WOKEntityDef/WOKEntity_Factory.edl $installRelatePath/lib/
-cp -f src/WOKEntityDef/WOKEntity_Parcel.edl $installRelatePath/lib/
-cp -f src/WOKEntityDef/WOKEntity_ParcelUnit.edl $installRelatePath/lib/
-cp -f src/WOKEntityDef/WOKEntity_Unit.edl $installRelatePath/lib/
-cp -f src/WOKEntityDef/WOKEntity_UnitTypes.edl $installRelatePath/lib/
-cp -f src/WOKEntityDef/WOKEntity_Warehouse.edl $installRelatePath/lib/
-cp -f src/WOKEntityDef/WOKEntity_Workbench.edl $installRelatePath/lib/
-cp -f src/WOKEntityDef/WOKEntity_WorkbenchUnit.edl $installRelatePath/lib/
-cp -f src/WOKEntityDef/WOKEntity_Workshop.edl $installRelatePath/lib/
-
-cp -f src/WOKStep/WOKStep_frontal.tcl $installRelatePath/lib/
-cp -f src/WOKStep/WOKStep_JavaCompile.tcl $installRelatePath/lib/
-cp -f src/WOKStep/WOKStep_JavaHeader.tcl $installRelatePath/lib/
-cp -f src/WOKStep/WOKStep_LibRename.tcl $installRelatePath/lib/
-cp -f src/WOKStep/WOKStep_ManifestEmbed.tcl $installRelatePath/lib/
-cp -f src/WOKStep/WOKStep_TclLibIdep.tcl $installRelatePath/lib/
-
-cp -f src/WOKStepsDef/FRONTAL.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_ccl.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_client.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_client_wnt.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_Del.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_delivery.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_documentation.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_engine.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_engine_wnt.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_executable.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_executable_wnt.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_frontal.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_idl.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_interface.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_interface_wnt.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_jini.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_nocdlpack.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_nocdlpack_wnt.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_package.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_package_wnt.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_resource.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_schema.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_schema_DFLT.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_schema_OBJS.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_schema_OBJY.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_server.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_toolkit.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKSteps_toolkit_wnt.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKStepsDeliv.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKStepsDFLT.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKStepsOBJS.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKStepsOBJY.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKStepsOrbix.edl $installRelatePath/lib/
-cp -f src/WOKStepsDef/WOKStepsStep.edl $installRelatePath/lib/
-
-cp -f src/WOKsite/wok.csh $installRelatePath/site/
-cp -f src/WOKsite/wokinit.csh $installRelatePath/site/
-cp -f src/WOKsite/DEFAULT.edl $installRelatePath/site/
-cp -f src/WOKsite/WOKSESSION.edl $installRelatePath/site/
-cp -f src/WOKsite/CreateFactory.tcl $installRelatePath/site/
-cp -f src/WOKsite/interp.tcl $installRelatePath/site/
-cp -f src/WOKsite/tclshrc.tcl $installRelatePath/site/
-cp -f src/WOKsite/wok_deps.tcl $installRelatePath/site/
-cp -f src/WOKsite/wok_depsgui.tcl $installRelatePath/site/
-cp -f src/WOKsite/wok_tclshrc.tcl $installRelatePath/site/
-cp -f src/WOKsite/wok_confgui.sh $installRelatePath/site/
-cp -f src/WOKsite/wok_emacs.sh $installRelatePath/site/
-cp -f src/WOKsite/wok_env.sh $installRelatePath/site/
-cp -f src/WOKsite/wok_init.sh $installRelatePath/site/
-cp -f src/WOKsite/wok_tclsh.sh $installRelatePath/site/
-cp -f src/WOKsite/tclshrc_Wok $installRelatePath/site/
-
-cp -f src/CPPClient/CPPClient_General.edl $installRelatePath/lib/
-cp -f src/CPPClient/CPPClient_Template.edl $installRelatePath/lib/
-
-# from WOKBuilderDef to lib folder
-cp -f src/WOKBuilderDef/ARX.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CDLTranslate.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CMPLRS.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CMPLRS_AIX.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CMPLRS_BSD.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CMPLRS_HP.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CMPLRS_LIN.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CMPLRS_MAC.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CMPLRS_SIL.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CMPLRS_SUN.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CMPLRS_WNT.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CODEGEN.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/COMMAND.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CPP.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CPPCLIENT.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CPPENG.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CPPINT.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CPPJINI.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CSF.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CSF_AIX.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CSF_AO1.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CSF_BSD.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CSF_HP.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CSF_LIN.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CSF_MAC.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CSF_SIL.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CSF_SUN.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CSF_WNT.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/CSFDBSCHEMA.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/JAVA.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/LD.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/LDAR.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/LDEXE.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/LDSHR.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/LIB.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/LINK.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/LINKSHR.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/STUBS.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/TCPP.edl $installRelatePath/lib/
-cp -f src/WOKBuilderDef/USECONFIG.edl $installRelatePath/lib/
-
-cp -f src/WOKTclLib/templates/template.mam $installRelatePath/lib/
-cp -f src/WOKTclLib/templates/template.mamx $installRelatePath/lib/
-
-cp -r src/WOKTclLib/templates/*.* $installRelatePath/lib/templates/
-
-cp -f src/WOKTclLib/tclIndex $installRelatePath/lib/
-cp -f src/WOKTclLib/abstract.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/admin.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/arb.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/back.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/Browser.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/browser.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/BrowserOMT.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/BrowserSearch.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/bycol.xbm $installRelatePath/lib/
-cp -f src/WOKTclLib/bylast.xbm $installRelatePath/lib/
-cp -f src/WOKTclLib/bylong.xbm $installRelatePath/lib/
-cp -f src/WOKTclLib/byrow.xbm $installRelatePath/lib/
-cp -f src/WOKTclLib/caution.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/cback.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/ccl.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/ccl_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/cell.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/cfrwd.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/client.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/client_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/config.h $installRelatePath/lib/
-cp -f src/WOKTclLib/create.xpm $installRelatePath/site/
-cp -f src/WOKTclLib/danger.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/delete.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/delivery.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/delivery_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/dep.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/documentation.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/documentation_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/engine.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/engine_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/envir.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/envir_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/executable.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/executable_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/factory.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/factory_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/file.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/FILES $installRelatePath/lib/
-cp -f src/WOKTclLib/frontal.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/frontal_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/gettable.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/idl.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/idl_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/interface.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/interface_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/jini.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/jini_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/journal.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/MkBuild.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/news_cpwb.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/nocdlpack.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/nocdlpack_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/notes.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/OCCTDocumentation.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/OCCTProductsDocumentation.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/OCCTDocumentationProcedures.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/OCCTGetVersion.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/opencascade.gif $installRelatePath/lib/
-cp -f src/WOKTclLib/OS.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/osutils.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/package.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/package_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/params.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/parcel.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/parcel_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/patch.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/patches.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/path.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/persistent.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/pqueue.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/prepare.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/private.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/queue.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/README $installRelatePath/lib/
-cp -f src/WOKTclLib/reposit.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/resource.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/resource_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/rotate.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/scheck.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/schema.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/schema_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/see.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/see_closed.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/server.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/server_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/source.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/storable.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/tclx.nt $installRelatePath/lib/
-cp -f src/WOKTclLib/textfile_adm.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/textfile_rdonly.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/toolkit.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/toolkit_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/transient.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/ud2cvs_unix $installRelatePath/lib/
-cp -f src/WOKTclLib/unit.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/unit_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/unit_rdonly.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/upack.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/VC.example $installRelatePath/lib/
-cp -f src/WOKTclLib/warehouse.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/wbuild.hlp $installRelatePath/lib/
-cp -f src/WOKTclLib/wbuild.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wbuild.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/wcheck.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wcompare.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/WCOMPATIBLE.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wnews.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wnews_trigger.example $installRelatePath/lib/
-cp -f src/WOKTclLib/wok.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wok-comm.el $installRelatePath/lib/
-cp -f src/WOKTclLib/Wok_Init.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokcd.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/wokclient.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokCOO.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokCreations.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokcvs.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokDeletions.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokEDF.hlp $installRelatePath/lib/
-cp -f src/WOKTclLib/wokEDF.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokemacs.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokinit.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokinterp.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokMainHelp.hlp $installRelatePath/lib/
-cp -f src/WOKTclLib/wokNAV.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokPrepareHelp.hlp $installRelatePath/lib/
-cp -f src/WOKTclLib/wokPRM.hlp $installRelatePath/lib/
-cp -f src/WOKTclLib/wokPRM.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokprocs.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokPROP.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokQUE.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokRPR.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokRPRHelp.hlp $installRelatePath/lib/
-cp -f src/WOKTclLib/wokSEA.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/woksh.el $installRelatePath/lib/
-cp -f src/WOKTclLib/wokStuff.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/WOKVC.NOBASE $installRelatePath/lib/
-cp -f src/WOKTclLib/WOKVC.RCS $installRelatePath/lib/
-cp -f src/WOKTclLib/WOKVC.SCCS $installRelatePath/lib/
-cp -f src/WOKTclLib/WOKVC.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wokWaffQueueHelp.hlp $installRelatePath/lib/
-cp -f src/WOKTclLib/work.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/workbench.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/workbench_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/workbenchq.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/workshop.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/workshop_open.xpm $installRelatePath/lib/
-cp -f src/WOKTclLib/wprepare.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wstore.tcl $installRelatePath/lib/
-cp -f src/WOKTclLib/wstore_trigger.example $installRelatePath/lib/
-cp -f src/WOKTclLib/wutils.tcl $installRelatePath/lib/
-
-# echo.
-# echo =========end operation===========
-# if not "%doNotCopyForeignFileList%" == "" (
-  # echo "%doNotCopyForeignFileList% files has not been copied"
-# )
-# echo.
+fi
\ No newline at end of file

diff --git a/collect_binary_without_libs.bat b/collect_binary_without_libs.bat
index daf3b6db32a6dd5ac997b2dd72e4ed4f8858fcaa..bf3c0c6e5147fb31b5e3e6af2e14f8e0d709e7af 100644 (file)
--- a/collect_binary_without_libs.bat
+++ b/collect_binary_without_libs.bat
@@ -4,6 +4,8 @@ set COPYCMD=/Y
 
 set "installPath=package"
 
+if not "%1" == "" set "installPath=%1"
+
 mkdir "%installPath%\wok_entities\"
 
 mkdir "%installPath%\3rdparty\"
@@ -17,7 +19,6 @@ xcopy "src\WOKsite\tclshrc.tcl"    "%installPath%\home\"
 xcopy "src\WOKsite\.emacs"    "%installPath%\home\"
 
 xcopy "src\WOKsite\public_el" "%installPath%\site\public_el\" /S
-xcopy "custom.bat" "%installPath%\site\"
 
 xcopy "src\CPPJini\CPPJini_General.edl" "%installPath%\lib\"
 xcopy "src\CPPJini\CPPJini_Template.edl" "%installPath%\lib\"

diff --git a/collect_binary_without_libs.sh b/collect_binary_without_libs.sh
index 4e4857f6e713410c26ee0a8023029198e9a6811a..655a866b291939f6f61e883ae6c3f5664fcdc8b1 100644 (file)
--- a/collect_binary_without_libs.sh
+++ b/collect_binary_without_libs.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 installRelatePath="package"
+if [ "$1" != "" ]; then
+  installRelatePath=$1
+fi
 
 mkdir -p $installRelatePath/doc
 mkdir -p $installRelatePath/lib/lin
@@ -324,10 +327,3 @@ cp -f src/WOKTclLib/wprepare.tcl $installRelatePath/lib/
 cp -f src/WOKTclLib/wstore.tcl $installRelatePath/lib/
 cp -f src/WOKTclLib/wstore_trigger.example $installRelatePath/lib/
 cp -f src/WOKTclLib/wutils.tcl $installRelatePath/lib/
-
-# echo.
-# echo =========end operation===========
-# if not "%doNotCopyForeignFileList%" == "" (
-  # echo "%doNotCopyForeignFileList% files has not been copied"
-# )
-# echo.

diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl
index a9d99533ee9a17de4f4aa8acd1c8e80ade6a5e5b..f1cc10db6e8063572bc8ae9bdb58787ab69a9e4c 100755 (executable)
--- a/src/WOKTclLib/osutils.tcl
+++ b/src/WOKTclLib/osutils.tcl
@@ -1705,11 +1705,8 @@ proc osutils:mkCollectScript { theOutCfgFileName theProjectRootPath theIDE theBi
 # @param theTKDefines    - compiler macro definitions
 # @param theTKSrcFiles   - list of source files
 proc osutils:tkinfo { theRelativePath theToolKit theUsedLib theFrameworks theIncPaths theTKDefines theTKSrcFiles } {
-  set aRelatedPathPart [relativePath "$theOutDir" [pwd]] 
   set aWokStation "$::env(WOKSTATION)"
 
-  set aRelatedPathPart "$theRelativePath"
-
   # collect list of referred libraries to link with
   upvar $theUsedLib    aUsedLibs
   upvar $theFrameworks aFrameworks
@@ -1756,7 +1753,7 @@ proc osutils:tkinfo { theRelativePath theToolKit theUsedLib theFrameworks theInc
     }
   }
 
-  lappend anIncPaths "$aRelatedPathPart/inc"
+  lappend anIncPaths "$theRelativePath/inc"
   set listloc [osutils:tk:units [woklocate -u $theToolKit]]
 
   if { [llength $listloc] == 0 } {
@@ -1775,7 +1772,7 @@ proc osutils:tkinfo { theRelativePath theToolKit theUsedLib theFrameworks theInc
     foreach aSrcFile [lsort $aSrcFiles] {
       if { ![info exists written([file tail $aSrcFile])] } {
         set written([file tail $aSrcFile]) 1
-        lappend aTKSrcFiles "${aRelatedPathPart}/[wokUtils:FILES:wtail $aSrcFile 3]"
+        lappend aTKSrcFiles "${theRelativePath}/[wokUtils:FILES:wtail $aSrcFile 3]"
       } else {
         puts "Warning : more than one occurences for [file tail $aSrcFile]"
       }
@@ -1787,8 +1784,8 @@ proc osutils:tkinfo { theRelativePath theToolKit theUsedLib theFrameworks theInc
     }
 
     # common include paths
-    lappend anIncPaths "${aRelatedPathPart}/drv/${xlo}"
-    lappend anIncPaths "${aRelatedPathPart}/src/${xlo}"
+    lappend anIncPaths "${theRelativePath}/drv/${xlo}"
+    lappend anIncPaths "${theRelativePath}/src/${xlo}"
   }
 
   # macros for UNIX to use config.h file
@@ -1844,15 +1841,21 @@ proc osutils:usedunixlibs { theToolKit } {
   lappend anUsedLibs "dl"
   lappend anUsedLibs "pthread"
   lappend anUsedLibs "rt"
-  
+
+  # Xlib
   lappend anUsedLibs "X11"
   lappend anUsedLibs "Xext"
   lappend anUsedLibs "Xmu"
   lappend anUsedLibs "Xi"
   
+  # TCL/TK 8.5
   lappend anUsedLibs "tcl8.5"
   lappend anUsedLibs "tk8.5"
-  
+
+  # FTGL
+  lappend anUsedLibs "freetype"
+  lappend anUsedLibs "ftgl"
+
   #if tbb
   lappend anUsedLibs "tbb"
   lappend anUsedLibs "tbbmalloc"
@@ -1866,6 +1869,40 @@ proc osutils:usedunixlibs { theToolKit } {
   return $anUsedLibs
 }
 
+proc osutils:usedmacoslibs { theToolKit } {
+  set anUsedLibs [list]
+
+  lappend anUsedLibs "objc"
+
+  # frameworks
+  lappend anUsedLibs "Appkit"
+  lappend anUsedLibs "IOKit"
+  lappend anUsedLibs "OpenGL"
+
+  # FTGL
+  lappend anUsedLibs "freetype"
+  lappend anUsedLibs "ftgl"
+
+  # to be removed
+  lappend anUsedLibs "X11"
+
+  # TCL/TK 8.5
+  lappend anUsedLibs "tcl8.5"
+  lappend anUsedLibs "tk8.5"
+
+  #if tbb
+  lappend anUsedLibs "tbb"
+  lappend anUsedLibs "tbbmalloc"
+
+  #if freeimage
+  lappend anUsedLibs "freeimage"
+
+  #if gl2ps
+  lappend anUsedLibs "gl2ps"
+
+  return $anUsedLibs
+}
+
 proc osutils:incpaths { theUnits theRelatedPath } {
   set anIncPaths [list]
   
@@ -1917,9 +1954,10 @@ proc osutils:fileGroupName { theSrcFile } {
 proc osutils:cmktk { theOutDir theToolKit {theIsExec false} theModule} { 
   set anOutFileName "CMakeLists.txt"  
 
-  set anCommonUsedToolKits [osutils:commonUsedTK $theToolKit]
-  set anUsedWntLibs        [osutils:usedwntlibs $theToolKit]
-  set anUsedUnixLibs       [osutils:usedunixlibs $theToolKit]
+  set anCommonUsedToolKits [osutils:commonUsedTK  $theToolKit]
+  set anUsedWntLibs        [osutils:usedwntlibs   $theToolKit]
+  set anUsedUnixLibs       [osutils:usedunixlibs  $theToolKit]
+  set anUsedMacLibs        [osutils:usedmacoslibs $theToolKit]
 
   set anUnits [list]
   foreach anUnitWithPath [osutils:tk:units [woklocate -u $theToolKit]] {
@@ -2002,6 +2040,38 @@ proc osutils:cmktk { theOutDir theToolKit {theIsExec false} theModule} {
       lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS ${anUsedWntLib} )"
     }
   }
+  lappend aFileBuff "elseif(APPLE)"
+  foreach anUsedMacLib $anUsedMacLibs {
+    if { $anUsedMacLib == "tbb" || $anUsedMacLib == "tbbmalloc" } {
+      lappend aFileBuff "  if(3RDPARTY_USE_TBB)"
+      lappend aFileBuff "    list( APPEND ${theToolKit}_USED_LIBS ${anUsedMacLib} )"
+      lappend aFileBuff "  endif()"
+    } elseif { $anUsedMacLib == "freeimage" } {
+      lappend aFileBuff "  if(3RDPARTY_USE_FREEIMAGE)"
+      lappend aFileBuff "    list( APPEND ${theToolKit}_USED_LIBS ${anUsedMacLib} )"
+      lappend aFileBuff "  endif()"
+    } elseif { $anUsedMacLib == "gl2ps" } {
+      lappend aFileBuff "  if(3RDPARTY_USE_GL2PS)"
+      lappend aFileBuff "    list( APPEND ${theToolKit}_USED_LIBS ${anUsedMacLib} )"
+      lappend aFileBuff "  endif()"
+    } elseif { $anUsedMacLib == "X11" } {
+      lappend aFileBuff "  find_package(X11 COMPONENTS X11 Xext Xmu Xi)"
+      lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS \$\{X11_LIBRARIES\} )"
+      lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS \$\{X11_Xi_LIB\} )"
+      lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS \$\{X11_Xmu_LIB\} )"
+    } elseif { $anUsedMacLib == "Appkit" } {
+      lappend aFileBuff "  find_library(FRAMEWORKS_APPKIT NAMES Appkit)"
+      lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS \$\{FRAMEWORKS_APPKIT\} )"
+    } elseif { $anUsedMacLib == "IOKit" } {
+      lappend aFileBuff "  find_library(FRAMEWORKS_IOKIT NAMES IOKit)"
+      lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS \$\{FRAMEWORKS_IOKIT\} )"
+    } elseif { $anUsedMacLib == "OpenGL" } {
+      lappend aFileBuff "  find_library(FRAMEWORKS_OPENGL NAMES OpenGL)"
+      lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS \$\{FRAMEWORKS_OPENGL\} )"
+    } elseif { $anUsedMacLib != "" } {
+      lappend aFileBuff "  list( APPEND ${theToolKit}_USED_LIBS ${anUsedMacLib} )"
+    }
+  }
   lappend aFileBuff "else()"
   foreach anUsedUnixLib $anUsedUnixLibs {
     if { $anUsedUnixLib == "tbb" || $anUsedUnixLib == "tbbmalloc" } {
@@ -2241,6 +2311,7 @@ proc osutils:cbp { theOutDir theProjName theSrcFiles theLibsList theFrameworks t
     puts $aFile "\t\t\t\t\t<Add option=\"-EHsc\" />"
     puts $aFile "\t\t\t\t\t<Add option=\"-O2\" />"
     puts $aFile "\t\t\t\t\t<Add option=\"-W3\" />"
+    puts $aFile "\t\t\t\t\t<Add option=\"-MP\" />"
   } else {
     puts $aFile "\t\t\t\t\t<Add option=\"-O2\" />"
   }
@@ -2292,6 +2363,7 @@ proc osutils:cbp { theOutDir theProjName theSrcFiles theLibsList theFrameworks t
     puts $aFile "\t\t\t\t\t<Add option=\"-Od\" />"
     puts $aFile "\t\t\t\t\t<Add option=\"-Zi\" />"
     puts $aFile "\t\t\t\t\t<Add option=\"-W3\" />"
+    puts $aFile "\t\t\t\t\t<Add option=\"-MP\" />"
   } else {
     puts $aFile "\t\t\t\t\t<Add option=\"-O0\" />"
     puts $aFile "\t\t\t\t\t<Add option=\"-g\" />"

diff --git a/src/WOKTclLib/templates/env.sh.in b/src/WOKTclLib/templates/env.sh.in
index 157c08e707f9403272de54f6d36806acef0e2461..fe71d1fd5c5154ad293d8c0e952c1d937c78b680 100644 (file)
--- a/src/WOKTclLib/templates/env.sh.in
+++ b/src/WOKTclLib/templates/env.sh.in
@@ -11,11 +11,46 @@ FREEIMAGE_DIR="@3RDPARTY_FREEIMAGE_DLL_DIR@"
 
 TCL_DIR="@3RDPARTY_TCL_DLL_DIR@"
 
-LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$FREETYPE_DIR:$FTGL_DIR:$GL2PS_DIR:$FREEIMAGE_DIR:$TBB_DIR:$TCL_DIR:$aScriptPath/lib"
+aLibPath="$aScriptPath/lib"
+if [ "$TCL_DIR" != "" ]; then
+  aLibPath="${TCL_DIR}:${aLibPath}"
+fi
+if [ "$TBB_DIR" != "" ]; then
+  aLibPath="${TBB_DIR}:${aLibPath}"
+fi
+if [ "$FREEIMAGE_DIR" != "" ]; then
+  aLibPath="${FREEIMAGE_DIR}:${aLibPath}"
+fi
+if [ "$GL2PS_DIR" != "" ]; then
+  aLibPath="${GL2PS_DIR}:${aLibPath}"
+fi
+if [ "$FTGL_DIR" != "" ]; then
+  aLibPath="${FTGL_DIR}:${aLibPath}"
+fi
+if [ "$FREETYPE_DIR" != "" ]; then
+  aLibPath="${FREETYPE_DIR}:${aLibPath}"
+fi
 
 # ----- Set path to 3rd party and OCCT libraries -----
-PATH="${PATH}:$aScriptPath/bin"
+aSystem=`uname -s`
+if [ "$aSystem" == "Darwin" ]; then
+  export WOKSTATION="mac";
+  if [ "$DYLD_LIBRARY_PATH" != "" ]; then
+    export DYLD_LIBRARY_PATH="${aLibPath}:${DYLD_LIBRARY_PATH}"
+  else
+    export DYLD_LIBRARY_PATH="${aLibPath}"
+  fi
+else
+  export WOKSTATION="lin";
+  if [ "$LD_LIBRARY_PATH" != "" ]; then
+    export LD_LIBRARY_PATH="${aLibPath}:${LD_LIBRARY_PATH}"
+  else
+    export LD_LIBRARY_PATH="${aLibPath}"
+  fi
+fi
 
+# ----- Set path to OCCT executables -----
+PATH="${PATH}:$aScriptPath/bin"
 
 # ----- Setup Environment Variables -----
 anArch=`uname -m`
@@ -24,13 +59,8 @@ if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then
 else
   export ARCH="64";
 fi
-
-aSystem=`uname -s`
 if [ "$aSystem" == "Darwin" ]; then
-  export WOKSTATION="mac";
   export ARCH="64";
-else
-  export WOKSTATION="lin";
 fi
 
 # ----- Set envoronment variables used by OCCT -----

diff --git a/src/WOKTclLib/templates/template.cmake b/src/WOKTclLib/templates/template.cmake
index 08e5ee0c3803d0771914e089f452a088659f9e25..68ed1177bcb69552c0a797d62ee537b441b274ab 100644 (file)
--- a/src/WOKTclLib/templates/template.cmake
+++ b/src/WOKTclLib/templates/template.cmake
@@ -35,10 +35,8 @@ separate_arguments(BUILD_TOOLKITS)
 __MODULE_LIST__
 
 if (WIN32)
-  set(SYSTEM win)
   set(SCRIPT_EXT bat)
 else()
-  set(SYSTEM lin)
   set(SCRIPT_EXT sh)
 endif()
 
@@ -60,14 +58,17 @@ if (${BUILD_BITNESS} STREQUAL 64)
   add_definitions(-D_OCC64)
 endif()
 
-add_definitions(-DCSFDB -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H)
+add_definitions(-DCSFDB)
 if(WIN32)
   add_definitions(/DWNT -wd4996)
-else()
-  add_definitions(-fexceptions -fPIC -DOCC_CONVERT_SIGNALS)
-  if(UNIX)
-    add_definitions(-DLIN)
+elseif(APPLE)
+  option(3RDPARTY_USE_GLX "Use X11 OpenGL on OSX?" OFF)
+  add_definitions(-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H)
+  if(3RDPARTY_USE_GLX)
+    add_definitions(-DMACOSX_USE_GLX)
   endif()
+else()
+  add_definitions(-fexceptions -fPIC -DOCC_CONVERT_SIGNALS -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H -DLIN)
 endif()
 
 string(REGEX MATCH "EHsc" ISFLAG "${CMAKE_CXX_FLAGS}")
@@ -77,6 +78,12 @@ ELSEIF(WIN32)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -EHa")
 ENDIF()
 
+IF(WIN32)
+  IF(NOT DEFINED MSVC70 AND NOT DEFINED MSVC80)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MP")
+  ENDIF()
+ENDIF()
+
 SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception")
 SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception")
 
@@ -157,6 +164,10 @@ IF(WIN32)
   SET(DLL_SO "dll")
   SET(DLL_SO_FOLDER "bin")
   SET(DLL_SO_PREFIX "")
+ELSEIF(APPLE)
+  SET(DLL_SO "dylib")
+  SET(DLL_SO_FOLDER "lib")
+  SET(DLL_SO_PREFIX "lib")
 ELSE()
   SET(DLL_SO "so")
   SET(DLL_SO_FOLDER "lib")

diff --git a/src/WOKTclLib/templates/template.vc10 b/src/WOKTclLib/templates/template.vc10
index 1ed696a933469202181fa5538b1965f1bdc6d5a0..59fccfa2264a6ed0eb7c71c04f48bb5c1c85f80f 100644 (file)
--- a/src/WOKTclLib/templates/template.vc10
+++ b/src/WOKTclLib/templates/template.vc10
@@ -78,6 +78,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -119,6 +120,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -161,6 +163,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -202,6 +205,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/src/WOKTclLib/templates/template.vc10x b/src/WOKTclLib/templates/template.vc10x
index d072539a4f2d3105a952ef25c8d89461711951c9..7b898e4047b308100165e204474882183b28cc52 100644 (file)
--- a/src/WOKTclLib/templates/template.vc10x
+++ b/src/WOKTclLib/templates/template.vc10x
@@ -78,6 +78,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -118,6 +119,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -159,6 +161,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -199,6 +202,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/src/WOKTclLib/templates/template.vc11 b/src/WOKTclLib/templates/template.vc11
index fdaceaf2236415f40ac9f021d34b9731fedb60dd..999705917c42366fcedd27a30dd7bd6cd2cdde8d 100644 (file)
--- a/src/WOKTclLib/templates/template.vc11
+++ b/src/WOKTclLib/templates/template.vc11
@@ -82,6 +82,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -123,6 +124,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -165,6 +167,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -206,6 +209,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/src/WOKTclLib/templates/template.vc11x b/src/WOKTclLib/templates/template.vc11x
index c51e14f5885383017b7d9e408fd80361cf9c516a..2fa2447f43ea70cb7191dad9e3252b6b84ea0f04 100644 (file)
--- a/src/WOKTclLib/templates/template.vc11x
+++ b/src/WOKTclLib/templates/template.vc11x
@@ -82,6 +82,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -122,6 +123,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -163,6 +165,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>NDEBUG;WIN64;_WINDOWS;WNT;No_Exception;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -203,6 +206,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <AdditionalIncludeDirectories>__TKINC__;$(CSF_OPT_INC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <PreprocessorDefinitions>DEB;_DEBUG;WIN64;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/src/WOKTclLib/templates/template.vc9 b/src/WOKTclLib/templates/template.vc9
index 2d862c25b280dea8b61e847c59f61cd62949ba79..60e71baa334eb644a06737b959b268a0169fac8f 100644 (file)
--- a/src/WOKTclLib/templates/template.vc9
+++ b/src/WOKTclLib/templates/template.vc9
@@ -48,6 +48,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="-MP"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
@@ -143,6 +144,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="-MP"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
                                InlineFunctionExpansion="1"
@@ -237,7 +239,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions="/favor:blend"
+                               AdditionalOptions="-MP -favor:blend"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
@@ -331,7 +333,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions="/favor:blend"
+                               AdditionalOptions="-MP -favor:blend"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
                                InlineFunctionExpansion="1"

diff --git a/src/WOKTclLib/templates/template.vc9x b/src/WOKTclLib/templates/template.vc9x
index 84030d61f14ac2644c9e7119fec48637be9cc778..83494ff60e9d6be3b5227f28a4535a64853ec43a 100644 (file)
--- a/src/WOKTclLib/templates/template.vc9x
+++ b/src/WOKTclLib/templates/template.vc9x
@@ -48,6 +48,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="-MP"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
@@ -138,6 +139,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               AdditionalOptions="-MP"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
                                PreprocessorDefinitions="DEB;_DEBUG;WIN32;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__"
@@ -228,7 +230,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions="/favor:blend"
+                               AdditionalOptions="-MP -favor:blend"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="2"
                                InlineFunctionExpansion="1"
@@ -320,7 +322,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions="/favor:blend"
+                               AdditionalOptions="-MP -favor:blend"
                                AdditionalIncludeDirectories="__TKINC__;$(CSF_OPT_INC)"
                                Optimization="0"
                                PreprocessorDefinitions="WIN64;DEB;_DEBUG;_WINDOWS;WNT;CSFDB;$(CSF_DEFINES)__TKDEFS__;_OCC64"