|
From: Eric E. <eri...@us...> - 2006-08-28 10:02:44
|
Update of /cvsroot/objecthandler/ObjectHandler In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21619 Modified Files: Makefile.am ObjectHandler.nsi ObjectHandler.sln ObjectHandler_vc8.sln configure.ac Log Message: merge R000104f0-branch Index: configure.ac =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.ac 29 Jul 2006 20:35:23 -0000 1.3 --- configure.ac 28 Aug 2006 10:02:09 -0000 1.4 *************** *** 55,63 **** Examples/C++/Makefile Examples/xl/Makefile - gensrc/config/Makefile gensrc/Makefile - gensrc/metadata/Makefile - gensrc/scripts/Makefile - gensrc/stubs/Makefile Makefile oh/Makefile --- 55,59 ---- Index: Makefile.am =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 26 Jul 2006 09:36:13 -0000 1.2 --- Makefile.am 28 Aug 2006 10:02:08 -0000 1.3 *************** *** 21,25 **** ObjectHandler.sln \ ObjectHandler_vc8.sln \ - ohlib.dsp \ ohlib.vcproj \ ohlib_vc8.vcproj \ --- 21,24 ---- Index: ObjectHandler.sln =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ObjectHandler.sln,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ObjectHandler.sln 8 Jun 2006 14:52:11 -0000 1.2 --- ObjectHandler.sln 28 Aug 2006 10:02:09 -0000 1.3 *************** *** 45,48 **** --- 45,52 ---- EndProjectSection EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "docs", "Docs\docs.vcproj", "{8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection + EndProject Global GlobalSection(SolutionConfiguration) = preSolution *************** *** 179,182 **** --- 183,200 ---- {19C36A53-51F2-4951-9A38-CCF6A250814F}.Release SingleThread.ActiveCfg = All|Win32 {19C36A53-51F2-4951-9A38-CCF6A250814F}.Release SingleThread.Build.0 = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.All.ActiveCfg = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.All.Build.0 = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.Debug.ActiveCfg = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.Debug.Build.0 = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.Debug CRTDLL.ActiveCfg = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.Debug CRTDLL.Build.0 = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.Debug SingleThread.ActiveCfg = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.Debug SingleThread.Build.0 = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.Release.ActiveCfg = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.Release.Build.0 = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.Release CRTDLL.ActiveCfg = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.Release CRTDLL.Build.0 = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.Release SingleThread.ActiveCfg = All|Win32 + {8CC19C10-6F1F-40AA-ADBF-12FDF6ED36A2}.Release SingleThread.Build.0 = All|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution Index: ObjectHandler.nsi =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ObjectHandler.nsi,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ObjectHandler.nsi 24 May 2006 14:22:07 -0000 1.4 --- ObjectHandler.nsi 28 Aug 2006 10:02:09 -0000 1.5 *************** *** 11,15 **** Caption "ObjectHandler - Setup" #do not change the name below ! OutFile "..\ObjectHandler-${VER_NUMBER}-${NOW}.exe" InstType "Full (w/ WinHelp Documentation)" --- 11,17 ---- Caption "ObjectHandler - Setup" #do not change the name below ! # suppress timestamp from filename for public release ! #OutFile "..\ObjectHandler-${VER_NUMBER}-${NOW}.exe" ! OutFile "..\ObjectHandler-${VER_NUMBER}.exe" InstType "Full (w/ WinHelp Documentation)" *************** *** 33,38 **** # INSTALLATION EXECUTION COMMANDS - - Section "-ObjectHandler" SectionIn 1 2 --- 35,38 ---- *************** *** 62,65 **** --- 62,91 ---- File "Examples\xl\*.xls" + SetOutPath "$INSTDIR\gensrc" + File "gensrc\Makefile.vc" + File "gensrc\gensrc.vcproj" + File "gensrc\gensrc_vc8.vcproj" + File /r "gensrc\*.xml" + File /r "gensrc\*.py" + File /r "gensrc\stub.*" + + SetOutPath "$INSTDIR\Docs" + File "Docs\ObjectHandler-docs-${VER_NUMBER}.chm" + File "Docs\objecthandler.doxy" + File "Docs\oh_footer.html" + File "Docs\oh_header.html" + File "Docs\oh_headeronline.html" + File "Docs\Makefile.vc" + File "Docs\style.css" + + SetOutPath "$INSTDIR\Docs\images" + File "Docs\images\*.ico" + File "Docs\images\*.jpg" + File "Docs\images\*.png" + File "Docs\images\*.gif" + + SetOutPath "$INSTDIR\Docs\pages" + File "Docs\pages\*.docs" + WriteRegStr HKEY_LOCAL_MACHINE \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\ObjectHandler-${VER_NUMBER}" \ *************** *** 95,99 **** WriteINIStr "$SMPROGRAMS\ObjectHandler-${VER_NUMBER}\ObjectHandler Home Page.url" \ ! "InternetShortcut" "URL" "http://objecthandler.sourceforge.net" WriteUninstaller "ObjectHandlerUninstall.exe" --- 121,125 ---- WriteINIStr "$SMPROGRAMS\ObjectHandler-${VER_NUMBER}\ObjectHandler Home Page.url" \ ! "InternetShortcut" "URL" "http://www.objecthandler.org" WriteUninstaller "ObjectHandlerUninstall.exe" *************** *** 116,120 **** WriteINIStr "$SMPROGRAMS\ObjectHandler-${VER_NUMBER}\ObjectHandler Home Page.url" \ ! "InternetShortcut" "URL" "http://objecthandler.sourceforge.net/" CreateShortCut "$SMPROGRAMS\ObjectHandler-${VER_NUMBER}\ObjectHandler Folder.lnk" \ --- 142,146 ---- WriteINIStr "$SMPROGRAMS\ObjectHandler-${VER_NUMBER}\ObjectHandler Home Page.url" \ ! "InternetShortcut" "URL" "http://www.objecthandler.org" CreateShortCut "$SMPROGRAMS\ObjectHandler-${VER_NUMBER}\ObjectHandler Folder.lnk" \ Index: ObjectHandler_vc8.sln =================================================================== RCS file: /cvsroot/objecthandler/ObjectHandler/ObjectHandler_vc8.sln,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ObjectHandler_vc8.sln 12 Jun 2006 12:50:28 -0000 1.8 --- ObjectHandler_vc8.sln 28 Aug 2006 10:02:09 -0000 1.9 *************** *** 1,5 ****  Microsoft Visual Studio Solution File, Format Version 9.00 ! # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExampleCpp", "Examples\C++\ExampleCpp_vc8.vcproj", "{90BF5136-C003-45AB-BB63-7AE014A07F4E}" ProjectSection(ProjectDependencies) = postProject --- 1,5 ----  Microsoft Visual Studio Solution File, Format Version 9.00 ! # Visual C++ Express 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExampleCpp", "Examples\C++\ExampleCpp_vc8.vcproj", "{90BF5136-C003-45AB-BB63-7AE014A07F4E}" ProjectSection(ProjectDependencies) = postProject *************** *** 43,46 **** --- 43,48 ---- EndProjectSection EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "docs", "Docs\docs_vc8.vcproj", "{74479EEA-CD1C-487E-8D31-F3EBF506ED40}" + EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution *************** *** 128,131 **** --- 130,143 ---- {BB902802-D59B-466F-ABB6-23368860D803}.Release CRTDLL|Win32.Build.0 = Release CRTDLL|Win32 {BB902802-D59B-466F-ABB6-23368860D803}.Release|Win32.ActiveCfg = Release CRTDLL|Win32 + {74479EEA-CD1C-487E-8D31-F3EBF506ED40}.All|Win32.ActiveCfg = All|Win32 + {74479EEA-CD1C-487E-8D31-F3EBF506ED40}.All|Win32.Build.0 = All|Win32 + {74479EEA-CD1C-487E-8D31-F3EBF506ED40}.Debug CRTDLL|Win32.ActiveCfg = All|Win32 + {74479EEA-CD1C-487E-8D31-F3EBF506ED40}.Debug CRTDLL|Win32.Build.0 = All|Win32 + {74479EEA-CD1C-487E-8D31-F3EBF506ED40}.Debug|Win32.ActiveCfg = All|Win32 + {74479EEA-CD1C-487E-8D31-F3EBF506ED40}.Debug|Win32.Build.0 = All|Win32 + {74479EEA-CD1C-487E-8D31-F3EBF506ED40}.Release CRTDLL|Win32.ActiveCfg = All|Win32 + {74479EEA-CD1C-487E-8D31-F3EBF506ED40}.Release CRTDLL|Win32.Build.0 = All|Win32 + {74479EEA-CD1C-487E-8D31-F3EBF506ED40}.Release|Win32.ActiveCfg = All|Win32 + {74479EEA-CD1C-487E-8D31-F3EBF506ED40}.Release|Win32.Build.0 = All|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution |
