Thread: [Hdrflow-svn] SF.net SVN: hdrflow: [358] trunk/lib/openlibraries/installer/ openlibraries_sdk.nsi
Status: Pre-Alpha
Brought to you by:
glslang
From: <gl...@us...> - 2007-10-14 13:23:07
|
Revision: 358 http://hdrflow.svn.sourceforge.net/hdrflow/?rev=358&view=rev Author: glslang Date: 2007-10-14 06:23:05 -0700 (Sun, 14 Oct 2007) Log Message: ----------- + build fix Modified Paths: -------------- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi =================================================================== --- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-10-13 17:50:57 UTC (rev 357) +++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2007-10-14 13:23:05 UTC (rev 358) @@ -316,7 +316,7 @@ ;-------------------------------- ;Include environment variable Push "OPENLIBRARIES_INCLUDE_PATH" - Push "$INSTDIR\include\openlibraries-${VERSION}" + Push "$INSTDIR\include\openlibraries-${VERSION_DOT}" Call WriteEnvStr ;-------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2008-01-27 15:18:56
|
Revision: 405 http://hdrflow.svn.sourceforge.net/hdrflow/?rev=405&view=rev Author: glslang Date: 2008-01-27 07:18:39 -0800 (Sun, 27 Jan 2008) Log Message: ----------- + break with the hive Modified Paths: -------------- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi =================================================================== --- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2008-01-27 14:52:03 UTC (rev 404) +++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi 2008-01-27 15:18:39 UTC (rev 405) @@ -13,15 +13,15 @@ !ifdef OUTFILE OutFile "${OUTFILE}" !else - OutFile openlibraries-${VERSION_DOT}-sdk.exe + OutFile hdrflow-${VERSION_DOT}-sdk.exe !endif SetCompressor /SOLID lzma InstType "Full" -InstallDir $PROGRAMFILES\OpenLibraries -InstallDirRegKey HKLM Software\OpenLibraries "" +InstallDir $PROGRAMFILES\HDRFlow +InstallDirRegKey HKLM Software\HDRFlow "" ;-------------------------------- ;Header Files @@ -47,8 +47,8 @@ !define MUI_COMPONENTSPAGE_SMALLDESC ;Pages -!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION_DOT}) Setup Wizard" -!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of OpenLibraries.\r\n\r\n$_CLICK" +!define MUI_WELCOMEPAGE_TITLE "Welcome to HDRFlow SDK (v.${VERSION_DOT}) Setup Wizard" +!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of HDRFlow SDK.\r\n\r\n$_CLICK" !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE "..\COPYING" @@ -57,7 +57,7 @@ !insertmacro MUI_PAGE_INSTFILES !define MUI_FINISHPAGE_LINK "Visit the web site for the latest news, FAQs and support" -!define MUI_FINISHPAGE_LINK_LOCATION "http://www.openlibraries.org/" +!define MUI_FINISHPAGE_LINK_LOCATION "http://www.hdrflow.com/" !insertmacro MUI_PAGE_FINISH @@ -72,7 +72,7 @@ Section "OpenLibraries" SecCore SetDetailsPrint textonly - DetailPrint "Installing OpenLibraries..." + DetailPrint "Installing HDRFlow SDK..." SetDetailsPrint listonly SectionIn 1 2 3 RO @@ -80,7 +80,7 @@ SetOverwrite on - SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openpluginlib\pl + SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openpluginlib\pl File ..\src\openpluginlib\pl\allocatorstringstorage.h File ..\src\openpluginlib\pl\bind_info.hpp File ..\src\openpluginlib\pl\cg.hpp @@ -108,7 +108,7 @@ File ..\src\openpluginlib\pl\utf8_utils.hpp File ..\src\openpluginlib\pl\vectorstringstorage.h - SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openpluginlib\pl\pcos + SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openpluginlib\pl\pcos File ..\src\openpluginlib\pl\pcos\iproperty_container.hpp File ..\src\openpluginlib\pl\pcos\isubject.hpp File ..\src\openpluginlib\pl\pcos\iclonable.hpp @@ -119,7 +119,7 @@ File ..\src\openpluginlib\pl\pcos\subject.hpp File ..\src\openpluginlib\pl\pcos\visitor.hpp - SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openimagelib\il + SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openimagelib\il File ..\src\openimagelib\il\basic_image.hpp File ..\src\openimagelib\il\compression_traits.hpp File ..\src\openimagelib\il\config.hpp @@ -132,7 +132,7 @@ File ..\src\openimagelib\il\yuv_traits.hpp File ..\src\openimagelib\il\lut_functions.hpp - SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openmedialib\ml + SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openmedialib\ml File ..\src\openmedialib\ml\audio.hpp File ..\src\openmedialib\ml\config.hpp File ..\src\openmedialib\ml\filter.hpp @@ -142,27 +142,8 @@ File ..\src\openmedialib\ml\openmedialib_plugin.hpp File ..\src\openmedialib\ml\store.hpp File ..\src\openmedialib\ml\utilities.hpp - - SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openobjectlib\sg - File ..\src\openobjectlib\sg\appearance.hpp - File ..\src\openobjectlib\sg\bbox_volume.hpp - File ..\src\openobjectlib\sg\calculate_tangent_space.hpp - File ..\src\openobjectlib\sg\config.hpp - File ..\src\openobjectlib\sg\constant_time_dispatcher.hpp - File ..\src\openobjectlib\sg\core.hpp - File ..\src\openobjectlib\sg\graph_updater.hpp - File ..\src\openobjectlib\sg\hw_GL_renderer.hpp - File ..\src\openobjectlib\sg\lexical_cast.hpp - File ..\src\openobjectlib\sg\meshes.hpp - File ..\src\openobjectlib\sg\openobjectlib_plugin.hpp - File ..\src\openobjectlib\sg\render_buffer.hpp - File ..\src\openobjectlib\sg\scene.hpp - File ..\src\openobjectlib\sg\sg.hpp - File ..\src\openobjectlib\sg\shaders.hpp - File ..\src\openobjectlib\sg\spatial.hpp - File ..\src\openobjectlib\sg\spirit.hpp - - SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openassetlib\al + + SetOutPath $INSTDIR\include\hdrflow-${VERSION_DOT}\openassetlib\al File ..\src\openassetlib\al\al.hpp File ..\src\openassetlib\al\al_plugin.hpp File ..\src\openassetlib\al\asset.hpp @@ -185,7 +166,7 @@ ; dependencies File "C:\Program Files\FFmpeg\lib\avcodec-51.dll" - File "C:\Program Files\FFmpeg\lib\avformat-51.dll" + File "C:\Program Files\FFmpeg\lib\avformat-52.dll" File "C:\Program Files\FFmpeg\lib\avutil-49.dll" File "C:\OpenEXR\bin\Debug\Half.dll" File "C:\OpenEXR\bin\Debug\Iex.dll" @@ -217,8 +198,8 @@ File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.lib" SetOutPath $INSTDIR\plugins\debug - File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl" - File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Debug DLL\openimagelib_3D_lightmap-vc80-d-${VERSION}.dll" +; File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl" +; File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Debug DLL\openimagelib_3D_lightmap-vc80-d-${VERSION}.dll" File "..\src\openimagelib\plugins\dds\dds_plugin.opl" File "..\src\openimagelib\plugins\dds\Multi-threaded Debug DLL\openimagelib_dds-vc80-d-${VERSION}.dll" File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl" @@ -243,12 +224,12 @@ File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-${VERSION}.dll" File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl" File "..\src\openmedialib\plugins\ofx\Multi-threaded Debug DLL\openmedialib_ofx-vc80-d-${VERSION}.dll" - ;File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl" - ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Debug DLL\openobjectlib_3ds-vc80-d-${VERSION}.dll" - File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl" - File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll" - File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl" - File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll" +; File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl" +; File "..\src\openobjectlib\plugins\3ds\Multi-threaded Debug DLL\openobjectlib_3ds-vc80-d-${VERSION}.dll" +; File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl" +; File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-${VERSION}.dll" +; File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl" +; File "..\src\openobjectlib\plugins\X3D\Multi-threaded Debug DLL\openobjectlib_x3d-vc80-d-${VERSION}.dll" File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl" File "..\src\openassetlib\plugins\sqlite\Multi-threaded Debug DLL\openassetlib_sqlite-vc80-d-${VERSION}.dll" File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl" @@ -281,12 +262,12 @@ File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-${VERSION}.dll" File "..\src\openmedialib\plugins\ofx\ofx_plugin.opl" File "..\src\openmedialib\plugins\ofx\Multi-threaded Release DLL\openmedialib_ofx-vc80-r-${VERSION}.dll" - ;File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl" - ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll" - File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl" - File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll" - File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl" - File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll" +; File "..\src\openobjectlib\plugins\3ds\3ds_plugin.opl" +; File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll" +; File "..\src\openobjectlib\plugins\wavefront\obj_plugin.opl" +; File "..\src\openobjectlib\plugins\wavefront\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-${VERSION}.dll" +; File "..\src\openobjectlib\plugins\X3D\x3d_plugin.opl" +; File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll" File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl" File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll" @@ -316,13 +297,13 @@ ;-------------------------------- ;Include environment variable - Push "OPENLIBRARIES_INCLUDE_PATH" - Push "$INSTDIR\include\openlibraries-${VERSION_DOT}" + Push "HDRFLOW_INCLUDE_PATH" + Push "$INSTDIR\include\hdrflow-${VERSION_DOT}" Call WriteEnvStr ;-------------------------------- ;Lib environment variable - Push "OPENLIBRARIES_LIB_PATH" + Push "HDRFLOW_LIB_PATH" Push "$INSTDIR\lib" Call WriteEnvStr @@ -335,20 +316,20 @@ ;-------------------------------- ;Registry -WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion" "${VERSION_DOT}" -WriteRegStr HKLM "Software\OpenLibraries" "PluginsDirDebug" "$INSTDIR\plugins\debug" -WriteRegStr HKLM "Software\OpenLibraries" "PluginsDirRelease" "$INSTDIR\plugins\release" -WriteRegStr HKLM "Software\OpenLibraries" "KernelsDir" "$INSTDIR\kernels" -WriteRegStr HKLM "Software\OpenLibraries" "ShadersDir" "$INSTDIR\shaders" +WriteRegStr HKLM "Software\HDRFlow" "CurrentVersion" "${VERSION_DOT}" +WriteRegStr HKLM "Software\HDRFlow" "PluginsDirDebug" "$INSTDIR\plugins\debug" +WriteRegStr HKLM "Software\HDRFlow" "PluginsDirRelease" "$INSTDIR\plugins\release" +WriteRegStr HKLM "Software\HDRFlow" "KernelsDir" "$INSTDIR\kernels" +WriteRegStr HKLM "Software\HDRFlow" "ShadersDir" "$INSTDIR\shaders" -WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "DisplayName" "OpenLibraries" -WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString" "$INSTDIR\uninst-openlibraries.exe" +WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "DisplayName" "HDRFlow" +WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString" "$INSTDIR\uninst-hdrflow.exe" SectionEnd Section -post - WriteUninstaller $INSTDIR\uninst-openlibraries.exe + WriteUninstaller $INSTDIR\uninst-hdrflow.exe SectionEnd @@ -356,7 +337,7 @@ ;Descriptions !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "OpenLibraries development and runtime files" + !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "HDRFlow development and runtime files" !insertmacro MUI_FUNCTION_DESCRIPTION_END ;-------------------------------- @@ -368,16 +349,16 @@ DetailPrint "Deleting Files..." SetDetailsPrint listonly - DeleteRegKey HKLM "Software\OpenLibraries" - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" + DeleteRegKey HKLM "Software\HDRFlow" + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" Push "$INSTDIR\bin" Call un.RemoveFromPath - Push "OPENLIBRARIES_LIB_PATH" + Push "HDRFLOW_LIB_PATH" Call un.DeleteEnvStr - Push "OPENLIBRARIES_INCLUDE_PATH" + Push "HDRFLOW_INCLUDE_PATH" Call un.DeleteEnvStr Push "PYTHONPATH" @@ -397,7 +378,7 @@ Function .onInit - ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenLibraries" "UninstallString" + ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\HDRFlow" "UninstallString" StrCmp $R0 "" done MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \ @@ -422,8 +403,7 @@ ; components page, make sure all sections are uninstalled. goto done no_remove_uninstaller: - MessageBox MB_ICONEXCLAMATION \ - "Unable to remove previous version of OpenLibraries" + MessageBox MB_ICONEXCLAMATION "Unable to remove previous version of HDRFlow" Abort done: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |