[Hdrflow-svn] SF.net SVN: hdrflow: [324] trunk/lib/openlibraries/installer

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 324
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=324&view=rev
Author:   glslang
Date:     2007-09-30 06:56:58 -0700 (Sun, 30 Sep 2007)

Log Message:
-----------
+ generalise the plugin versioning in the installers

Modified Paths:
--------------
    trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
    trunk/lib/openlibraries/installer/openlibraries_sdk.nsi

Modified: trunk/lib/openlibraries/installer/openlibraries_runtime.nsi
===================================================================

--- trunk/lib/openlibraries/installer/openlibraries_runtime.nsi	2007-09-30 12:11:13 UTC (rev 323)
+++ trunk/lib/openlibraries/installer/openlibraries_runtime.nsi	2007-09-30 13:56:58 UTC (rev 324)
@@ -4,6 +4,7 @@
 
 !ifndef VERSION
   !define VERSION 0.4.0
+  !define VERSION_DOT 0.4.0
 !endif
 
 ;--------------------------------
@@ -12,7 +13,7 @@
 !ifdef OUTFILE
   OutFile "${OUTFILE}"
 !else
-  OutFile openlibraries-${VERSION}-runtime.exe
+  OutFile openlibraries-${VERSION_DOT}-runtime.exe
 !endif
 
 SetCompressor /SOLID lzma
@@ -34,7 +35,7 @@
 
 ;Names
 Name "OpenLibraries"
-Caption "OpenLibraries (v.${VERSION}) Setup"
+Caption "OpenLibraries (v.${VERSION_DOT}) Setup"
 
 ;Interface Settings
 !define MUI_ABORTWARNING
@@ -46,7 +47,7 @@
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
 ;Pages
-!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION}) Setup Wizard"
+!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"
 
 !insertmacro MUI_PAGE_WELCOME
@@ -80,11 +81,11 @@
   SetOverwrite on
 
   SetOutPath $INSTDIR\bin
-  File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_0.dll"
-  File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_0.dll"
-  File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_0.dll"
-  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_0.dll"
-  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_0.dll"
+  File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll"
+  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.dll"
+  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.dll"
 
   ; dependencies
   File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
@@ -109,41 +110,41 @@
   
   SetOutPath $INSTDIR\plugins\release
   File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
-  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
-  File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
-  File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
-  File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
-  File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
-  File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
-  File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
-  File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
-  File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
-  File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-0_4_0.dll"
+  File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-0_4_0.dll"
+  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
-  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-0_4_0.dll"
+  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-0_4_0.dll"
+  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-0_4_0.dll"
+  ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
   File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
-  File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-0_4_0.dll"
+  File "..\src\openobjectlib\plugins\obj\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-0_4_0.dll"
+  File "..\src\openobjectlib\plugins\X3D\Multi-threaded Release DLL\openobjectlib_x3d-vc80-r-${VERSION}.dll"
   File "..\src\openassetlib\plugins\sqlite\sqlite3_metadata_plugin.opl"
-  File "..\src\openassetlib\plugins\sqlite\Multi-threaded Release DLL\openassetlib_sqlite-vc80-r-0_4_0.dll"
+  File "..\src\openassetlib\plugins\sqlite\Multi-threaded Release DLL\openassetlib_sqlite-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-0_4_0.dll"
+  File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
   
   SetOutPath $INSTDIR\shaders
   File "..\effects\shaders\sepia.cg"
@@ -179,7 +180,7 @@
 ;--------------------------------
 ;Registry
 
-WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion"		"${VERSION}"
+WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion"		"${VERSION_DOT}"
 WriteRegStr HKLM "Software\OpenLibraries" "PluginsDirRelease"	"$INSTDIR\plugins\release"
 WriteRegStr HKLM "Software\OpenLibraries" "KernelsDir"			"$INSTDIR\kernels"
 WriteRegStr HKLM "Software\OpenLibraries" "ShadersDir"			"$INSTDIR\shaders"

Modified: trunk/lib/openlibraries/installer/openlibraries_sdk.nsi
===================================================================
--- trunk/lib/openlibraries/installer/openlibraries_sdk.nsi	2007-09-30 12:11:13 UTC (rev 323)
+++ trunk/lib/openlibraries/installer/openlibraries_sdk.nsi	2007-09-30 13:56:58 UTC (rev 324)
@@ -3,7 +3,8 @@
 ;--------------------------------
 
 !ifndef VERSION
-  !define VERSION 0.4.0
+  !define VERSION 0_4_0
+  !define VERSION_DOT 0.4.0
 !endif
 
 ;--------------------------------
@@ -12,7 +13,7 @@
 !ifdef OUTFILE
   OutFile "${OUTFILE}"
 !else
-  OutFile openlibraries-${VERSION}-sdk.exe
+  OutFile openlibraries-${VERSION_DOT}-sdk.exe
 !endif
 
 SetCompressor /SOLID lzma
@@ -34,7 +35,7 @@
 
 ;Names
 Name "OpenLibraries"
-Caption "OpenLibraries (v.${VERSION}) Setup"
+Caption "OpenLibraries (v.${VERSION_DOT}) Setup"
 
 ;Interface Settings
 !define MUI_ABORTWARNING
@@ -46,7 +47,7 @@
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
 ;Pages
-!define MUI_WELCOMEPAGE_TITLE "Welcome to the OpenLibraries (v.${VERSION}) Setup Wizard"
+!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"
 
 !insertmacro MUI_PAGE_WELCOME
@@ -79,7 +80,7 @@
 
   SetOverwrite on
 
-  SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openpluginlib\pl
+  SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openpluginlib\pl
   File ..\src\openpluginlib\pl\allocatorstringstorage.h
   File ..\src\openpluginlib\pl\bind_info.hpp
   File ..\src\openpluginlib\pl\cg.hpp
@@ -107,7 +108,7 @@
   File ..\src\openpluginlib\pl\utf8_utils.hpp
   File ..\src\openpluginlib\pl\vectorstringstorage.h
   
-  SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openpluginlib\pl\pcos
+  SetOutPath $INSTDIR\include\openlibraries-${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
@@ -118,7 +119,7 @@
   File ..\src\openpluginlib\pl\pcos\subject.hpp
   File ..\src\openpluginlib\pl\pcos\visitor.hpp
   
-  SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openimagelib\il
+  SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openimagelib\il
   File ..\src\openimagelib\il\basic_image.hpp
   File ..\src\openimagelib\il\compression_traits.hpp
   File ..\src\openimagelib\il\config.hpp
@@ -130,7 +131,7 @@
   File ..\src\openimagelib\il\utility.hpp
   File ..\src\openimagelib\il\yuv_traits.hpp
   
-  SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openmedialib\ml
+  SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openmedialib\ml
   File ..\src\openmedialib\ml\audio.hpp
   File ..\src\openmedialib\ml\config.hpp
   File ..\src\openmedialib\ml\filter.hpp
@@ -141,7 +142,7 @@
   File ..\src\openmedialib\ml\store.hpp
   File ..\src\openmedialib\ml\utilities.hpp
  
-  SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openobjectlib\sg
+  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
@@ -160,7 +161,7 @@
   File ..\src\openobjectlib\sg\spatial.hpp
   File ..\src\openobjectlib\sg\spirit.hpp
   
-  SetOutPath $INSTDIR\include\openlibraries-${VERSION}\openassetlib\al
+  SetOutPath $INSTDIR\include\openlibraries-${VERSION_DOT}\openassetlib\al
   File ..\src\openassetlib\al\al.hpp
   File ..\src\openassetlib\al\al_plugin.hpp
   File ..\src\openassetlib\al\asset.hpp
@@ -170,16 +171,16 @@
   File ..\src\openassetlib\al\set.hpp
 
   SetOutPath $INSTDIR\bin
-  File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-0_4_0.dll"
-  File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_0.dll"
-  File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-0_4_0.dll"
-  File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_0.dll"
-  File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-0_4_0.dll"
-  File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_0.dll"
-  File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-0_4_0.dll"
-  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_0.dll"
-  File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-0_4_0.dll"
-  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_0.dll"
+  File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.dll"
+  File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.dll"
+  File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-${VERSION}.dll"
+  File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.dll"
+  File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.dll"
+  File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.dll"
+  File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-${VERSION}.dll"
+  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.dll"
+  File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-${VERSION}.dll"
+  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-${VERSION}.dll"
 
   ; dependencies
   File "C:\Program Files\FFmpeg\lib\avcodec-51.dll"
@@ -203,90 +204,90 @@
   File "..\src\openassetlib\py\Multi-threaded Debug DLL\HDRFlowAsset.pyd"
   
   SetOutPath $INSTDIR\lib
-  File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-0_4_0.lib"
-  File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-0_4_0.lib"
-  File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-0_4_0.lib"
-  File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-0_4_0.lib"
-  File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-0_4_0.lib"
-  File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-0_4_0.lib"
-  File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-0_4_0.lib"
-  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-0_4_0.lib"
-  File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-0_4_0.lib"
-  File "..\src\openassetlib\al\Multi-threaded Release DLL\openassetlib_al-vc80-r-0_4_0.lib"
+  File "..\src\openpluginlib\pl\Multi-threaded Debug DLL\openpluginlib_pl-vc80-d-${VERSION}.lib"
+  File "..\src\openpluginlib\pl\Multi-threaded Release DLL\openpluginlib_pl-vc80-r-${VERSION}.lib"
+  File "..\src\openimagelib\il\Multi-threaded Debug DLL\openimagelib_il-vc80-d-${VERSION}.lib"
+  File "..\src\openimagelib\il\Multi-threaded Release DLL\openimagelib_il-vc80-r-${VERSION}.lib"
+  File "..\src\openmedialib\ml\Multi-threaded Debug DLL\openmedialib_ml-vc80-d-${VERSION}.lib"
+  File "..\src\openmedialib\ml\Multi-threaded Release DLL\openmedialib_ml-vc80-r-${VERSION}.lib"
+  File "..\src\openobjectlib\sg\Multi-threaded Debug DLL\openobjectlib_sg-vc80-d-${VERSION}.lib"
+  File "..\src\openobjectlib\sg\Multi-threaded Release DLL\openobjectlib_sg-vc80-r-${VERSION}.lib"
+  File "..\src\openassetlib\al\Multi-threaded Debug DLL\openassetlib_al-vc80-d-${VERSION}.lib"
+  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-0_4_0.dll"
+  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-0_4_0.dll"
+  File "..\src\openimagelib\plugins\dds\Multi-threaded Debug DLL\openimagelib_dds-vc80-d-${VERSION}.dll"
   File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
-  File "..\src\openimagelib\plugins\dpx\Multi-threaded Debug DLL\openimagelib_dpx-vc80-d-0_4_0.dll"
+  File "..\src\openimagelib\plugins\dpx\Multi-threaded Debug DLL\openimagelib_dpx-vc80-d-${VERSION}.dll"
   File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
-  File "..\src\openimagelib\plugins\exr\Multi-threaded Debug DLL\openimagelib_exr-vc80-d-0_4_0.dll"
+  File "..\src\openimagelib\plugins\exr\Multi-threaded Debug DLL\openimagelib_exr-vc80-d-${VERSION}.dll"
   File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
-  File "..\src\openimagelib\plugins\gdi+\Multi-threaded Debug DLL\openimagelib_gdi-vc80-d-0_4_0.dll"
+  File "..\src\openimagelib\plugins\gdi+\Multi-threaded Debug DLL\openimagelib_gdi-vc80-d-${VERSION}.dll"
   File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
-  File "..\src\openimagelib\plugins\hdr\Multi-threaded Debug DLL\openimagelib_hdr-vc80-d-0_4_0.dll"
+  File "..\src\openimagelib\plugins\hdr\Multi-threaded Debug DLL\openimagelib_hdr-vc80-d-${VERSION}.dll"
   File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
-  File "..\src\openimagelib\plugins\jpg\Multi-threaded Debug DLL\openimagelib_jpg-vc80-d-0_4_0.dll"
+  File "..\src\openimagelib\plugins\jpg\Multi-threaded Debug DLL\openimagelib_jpg-vc80-d-${VERSION}.dll"
   File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
-  File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-0_4_0.dll"
+  File "..\src\openimagelib\plugins\sgi\Multi-threaded Debug DLL\openimagelib_sgi-vc80-d-${VERSION}.dll"
   File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
-  File "..\src\openimagelib\plugins\tga\Multi-threaded Debug DLL\openimagelib_tga-vc80-d-0_4_0.dll"
+  File "..\src\openimagelib\plugins\tga\Multi-threaded Debug DLL\openimagelib_tga-vc80-d-${VERSION}.dll"
   File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
-  File "..\src\openmedialib\plugins\oil\Multi-threaded Debug DLL\openmedialib_oil-vc80-d-0_4_0.dll"
+  File "..\src\openmedialib\plugins\oil\Multi-threaded Debug DLL\openmedialib_oil-vc80-d-${VERSION}.dll"
   File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-  File "..\src\openmedialib\plugins\gensys\Multi-threaded Debug DLL\openmedialib_gensys-vc80-d-0_4_0.dll"
+  File "..\src\openmedialib\plugins\gensys\Multi-threaded Debug DLL\openmedialib_gensys-vc80-d-${VERSION}.dll"
   File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
-  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Debug DLL\openmedialib_quicktime-vc80-d-0_4_0.dll"
+  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-0_4_0.dll"
+  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-0_4_0.dll"
+  ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Debug DLL\openobjectlib_3ds-vc80-d-${VERSION}.dll"
   File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
-  File "..\src\openobjectlib\plugins\obj\Multi-threaded Debug DLL\openobjectlib_obj-vc80-d-0_4_0.dll"
+  File "..\src\openobjectlib\plugins\obj\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-0_4_0.dll"
+  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-0_4_0.dll"
+  File "..\src\openassetlib\plugins\sqlite\Multi-threaded Debug DLL\openassetlib_sqlite-vc80-d-${VERSION}.dll"
   File "..\src\openeffectslib\plugins\tonemap\tonemap_plugin.opl"
-  File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Debug DLL\openeffectslib_tonemap-vc80-d-0_4_0.dll"
+  File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Debug DLL\openeffectslib_tonemap-vc80-d-${VERSION}.dll"
   
   SetOutPath $INSTDIR\plugins\release
   File "..\src\openimagelib\plugins\3D_lightmap\3D_lightmap_plugin.opl"
-  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\3D_lightmap\Multi-threaded Release DLL\openimagelib_3D_lightmap-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\dds\dds_plugin.opl"
-  File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\dds\Multi-threaded Release DLL\openimagelib_dds-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\dpx\dpx_plugin.opl"
-  File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\dpx\Multi-threaded Release DLL\openimagelib_dpx-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\exr\exr_plugin.opl"
-  File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\exr\Multi-threaded Release DLL\openimagelib_exr-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\gdi+\gdi_plugin.opl"
-  File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\gdi+\Multi-threaded Release DLL\openimagelib_gdi-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\hdr\hdr_plugin.opl"
-  File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\hdr\Multi-threaded Release DLL\openimagelib_hdr-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\jpg\jpg_plugin.opl"
-  File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\jpg\Multi-threaded Release DLL\openimagelib_jpg-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\sgi\sgi_plugin.opl"
-  File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\sgi\Multi-threaded Release DLL\openimagelib_sgi-vc80-r-${VERSION}.dll"
   File "..\src\openimagelib\plugins\tga\tga_plugin.opl"
-  File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-0_4_0.dll"
+  File "..\src\openimagelib\plugins\tga\Multi-threaded Release DLL\openimagelib_tga-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\oil\oil_plugin.opl"
-  File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-0_4_0.dll"
+  File "..\src\openmedialib\plugins\oil\Multi-threaded Release DLL\openmedialib_oil-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\gensys\gensys_plugin.opl"
-  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-0_4_0.dll"
+  File "..\src\openmedialib\plugins\gensys\Multi-threaded Release DLL\openmedialib_gensys-vc80-r-${VERSION}.dll"
   File "..\src\openmedialib\plugins\quicktime\quicktime_plugin.opl"
-  File "..\src\openmedialib\plugins\quicktime\Multi-threaded Release DLL\openmedialib_quicktime-vc80-r-0_4_0.dll"
+  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-0_4_0.dll"
+  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-0_4_0.dll"
+  ;File "..\src\openobjectlib\plugins\3ds\Multi-threaded Release DLL\openobjectlib_3ds-vc80-r-${VERSION}.dll"
   File "..\src\openobjectlib\plugins\obj\obj_plugin.opl"
-  File "..\src\openobjectlib\plugins\obj\Multi-threaded Release DLL\openobjectlib_obj-vc80-r-0_4_0.dll"
+  File "..\src\openobjectlib\plugins\obj\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-0_4_0.dll"
+  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-0_4_0.dll"
+  File "..\src\openeffectslib\plugins\tonemap\Multi-threaded Release DLL\openeffectslib_tonemap-vc80-r-${VERSION}.dll"
   
   SetOutPath $INSTDIR\shaders
   File "..\effects\shaders\sepia.cg"
@@ -311,8 +312,6 @@
 
   Push "$INSTDIR\bin"
   Call AddToPath
-  Push "$INSTDIR\bin\Debug"
-  Call AddToPath
 
 ;--------------------------------
 ;Include environment variable
@@ -335,7 +334,7 @@
 ;--------------------------------
 ;Registry
 
-WriteRegStr HKLM "Software\OpenLibraries" "CurrentVersion"		"${VERSION}"
+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"
@@ -374,9 +373,6 @@
   Push "$INSTDIR\bin"
   Call un.RemoveFromPath
 
-  Push "$INSTDIR\bin\Debug"
-  Call un.RemoveFromPath
-
   Push "OPENLIBRARIES_LIB_PATH"
   Call un.DeleteEnvStr
 


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


