gtkmm r1050 - in trunk: . win32_installer

From: arminb svn gnome org
To: svn-commits-list gnome org
Subject: gtkmm r1050 - in trunk: . win32_installer
Date: Sun, 12 Oct 2008 20:56:06 +0000 (UTC)
Author: arminb
Date: Sun Oct 12 20:56:06 2008
New Revision: 1050
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1050&view=rev

Log:
2008-10-12  Armin Burgmeier  <armin arbur net>

	* win32_installer/install-msvc-module: Allow Specifing toolset to
	install the DLLs for.

	* win32_installer/build-installer: Updated to add MSVC 2008 DLLs
	to the installer.

	* win32_installer/gtkmm-installer.nsi.in: Added MSVC 2008 files, fixed
	a problem that the Uninstaller did not correctly uninstall start menu
	items of user-local installations.

	* win32_installer/gtkmm-2.4.vsprops:
	* win32_installer/gtkmm-2.4d.vsprops: Removed.

	* win32_installer/gtkmm-vc80-2_4.vsprops:
	* win32_installer/gtkmm-vc90-2_4.vsprops:
	* win32_installer/gtkmm-vc80-d-2_4.vsprops:
	* win32_installer/gtkmm-vc90-d-2_4.vsprops: New separate property
	sheets for MSVC 2005 and MSVC 2008, properly named, replacing the old
	ones.

Added:
   trunk/win32_installer/gtkmm-vc80-2_4.vsprops   (contents, props changed)
      - copied, changed from r1048, /trunk/win32_installer/gtkmm-2.4.vsprops
   trunk/win32_installer/gtkmm-vc80-d-2_4.vsprops   (contents, props changed)
      - copied, changed from r1048, /trunk/win32_installer/gtkmm-2.4d.vsprops
   trunk/win32_installer/gtkmm-vc90-2_4.vsprops
   trunk/win32_installer/gtkmm-vc90-d-2_4.vsprops
Removed:
   trunk/win32_installer/gtkmm-2.4.vsprops
   trunk/win32_installer/gtkmm-2.4d.vsprops
Modified:
   trunk/ChangeLog
   trunk/win32_installer/build-installer
   trunk/win32_installer/gtkmm-installer.nsi.in
   trunk/win32_installer/install-msvc-module

Modified: trunk/win32_installer/build-installer
==============================================================================
--- trunk/win32_installer/build-installer	(original)
+++ trunk/win32_installer/build-installer	Sun Oct 12 20:56:06 2008
@@ -3,10 +3,11 @@
 echo "This builds the development and runtime installers for gtkmm. Make "
 echo "sure to have everything (libsigc++, glibmm, cairomm, pangomm, gtkmm, "
 echo "libglademm, libxml++) installed to /usr/local, and to have "
-echo "successfully built everything with MSVC (both Debug and Release builds)."
-echo "Make also sure that the official GTK+ bundle has been unzipped to"
-echo "/bundle, as well as libxml2 and iconv runtime and development files."
-echo "Finally, make sure that makensis is in your PATH"
+echo "successfully built everything with both MSVC 2005 and MSVC 2008 (both "
+echo "Debug and Release builds). Make also sure that the official GTK+ "
+echo "bundle has been unzipped to echo /bundle, as well as libxml2 and iconv "
+echo "runtime and development files. Finally, make sure that makensis is in "
+echo "your PATH"
 
 # Copy all of /usr/local into here. It's probably more than we need, but we
 # can be sure we have the required stuff this way.
@@ -17,8 +18,7 @@
 cp -R /usr/local/share . || exit -1
 cp -R /usr/local/include . || exit -1
 
-# Same with /usr, for GTK+
-# TODO: Get this from a separate directory where only the bundle is to be installed...?
+# Same with /bundle, for GTK+
 cp -R /bundle/bin . || exit -1
 cp -R /bundle/lib . || exit -1
 cp -R /bundle/share . || exit -1
@@ -66,19 +66,19 @@
 
 # Get the MSVC files into here
 echo "Copying MSVC files..."
-./install-msvc-module libsigc++ || exit -1
-./install-msvc-module glibmm || exit -1
-./install-msvc-module giomm || exit -1
-./install-msvc-module cairomm || exit -1
-./install-msvc-module pangomm || exit -1
-./install-msvc-module atkmm || exit -1
-./install-msvc-module gdkmm || exit -1
-./install-msvc-module gtkmm || exit -1
-./install-msvc-module libglademm || exit -1
-./install-msvc-module libxml++ || exit -1
+for module in libsigc++ glibmm giomm cairomm pangomm atkmm gdkmm gtkmm libglademm libxml++; do
+	for toolset in vc80 vc90; do
+		./install-msvc-module $module $toolset || exit -1
+	done
+done
 
-cp gtkmm-2.4.vsprops MSVC || exit -1
-cp gtkmm-2.4d.vsprops MSVC || exit -1
+cp gtkmm-vc80-2_4.vsprops MSVC || exit -1
+cp gtkmm-vc90-2_4.vsprops MSVC || exit -1
+cp gtkmm-vc80-d-2_4.vsprops MSVC || exit -1
+cp gtkmm-vc90-d-2_4.vsprops MSVC || exit -1
+# Compatibility with old naming scheme
+cp gtkmm-vc80-2_4.vsprops MSVC/gtkmm-2.4.vsprops || exit -1
+cp gtkmm-vc80-d-2_4.vsprops MSVC/gtkmm-2.4d.vsprops || exit -1
 
 echo "Copying gtk-demo..."
 mkdir -p demo || exit -1

Modified: trunk/win32_installer/gtkmm-installer.nsi.in
==============================================================================
--- trunk/win32_installer/gtkmm-installer.nsi.in	(original)
+++ trunk/win32_installer/gtkmm-installer.nsi.in	Sun Oct 12 20:56:06 2008
@@ -460,10 +460,13 @@
   
   SetOutPath $INSTDIR\bin
   File ${BINDIR}\libsigc-2.0-0.dll
-  File MSVC\sigc-2.0.dll
+  File MSVC\sigc-vc80-2_0.dll
+  File MSVC\sigc-vc90-2_0.dll
   !ifndef RUNTIME_ONLY
-    File MSVC\sigc-2.0d.dll
-    File MSVC\sigc-2.0d.pdb
+    File MSVC\sigc-vc80-d-2_0.dll
+    File MSVC\sigc-vc90-d-2_0.dll
+    File MSVC\sigc-vc80-d-2_0.pdb
+    File MSVC\sigc-vc90-d-2_0.pdb
   !endif
   
 SectionEnd
@@ -479,8 +482,10 @@
   SetOutPath $INSTDIR\lib
   File lib\libsigc-2.0.dll.a
   File /r lib\sigc++-2.0
-  File MSVC\sigc-2.0.lib
-  File MSVC\sigc-2.0d.lib
+  File MSVC\sigc-vc80-2_0.lib
+  File MSVC\sigc-vc90-2_0.lib
+  File MSVC\sigc-vc80-d-2_0.lib
+  File MSVC\sigc-vc90-d-2_0.lib
   
   SetOutPath $INSTDIR\lib\pkgconfig
   File lib\pkgconfig\sigc++-2.0.pc
@@ -512,10 +517,13 @@
 
   SetOutPath $INSTDIR\bin
   File ${BINDIR}\libcairomm-1.0-1.dll
-  File MSVC\cairomm-1.0.dll
+  File MSVC\cairomm-vc80-1_0.dll
+  File MSVC\cairomm-vc90-1_0.dll
   !ifndef RUNTIME_ONLY
-    File MSVC\cairomm-1.0d.dll
-    File MSVC\cairomm-1.0d.pdb
+    File MSVC\cairomm-vc80-d-1_0.dll
+    File MSVC\cairomm-vc90-d-1_0.dll
+    File MSVC\cairomm-vc80-d-1_0.pdb
+    File MSVC\cairomm-vc90-d-1_0.pdb
   !endif
   
 SectionEnd
@@ -530,8 +538,10 @@
 
   SetOutPath $INSTDIR\lib
   File lib\libcairomm-1.0.dll.a
-  File MSVC\cairomm-1.0.lib
-  File MSVC\cairomm-1.0d.lib
+  File MSVC\cairomm-vc80-1_0.lib
+  File MSVC\cairomm-vc90-1_0.lib
+  File MSVC\cairomm-vc80-d-1_0.lib
+  File MSVC\cairomm-vc90-d-1_0.lib
 
   SetOutPath $INSTDIR\lib\pkgconfig
   File lib\pkgconfig\cairomm-1.0.pc
@@ -564,13 +574,19 @@
   File ${BINDIR}\libglibmm-2.4-1.dll
   File ${BINDIR}\libgiomm-2.4-1.dll
   File ${BINDIR}\libglibmm_generate_extra_defs-2.4-1.dll
-  File MSVC\glibmm-2.4.dll
-  File MSVC\giomm-2.4.dll
+  File MSVC\glibmm-vc80-2_4.dll
+  File MSVC\glibmm-vc90-2_4.dll
+  File MSVC\giomm-vc80-2_4.dll
+  File MSVC\giomm-vc90-2_4.dll
   !ifndef RUNTIME_ONLY
-    File MSVC\glibmm-2.4d.dll
-    File MSVC\glibmm-2.4d.pdb
-    File MSVC\giomm-2.4d.dll
-    File MSVC\giomm-2.4d.pdb
+    File MSVC\glibmm-vc80-d-2_4.dll
+    File MSVC\glibmm-vc90-d-2_4.dll
+    File MSVC\glibmm-vc80-d-2_4.pdb
+    File MSVC\glibmm-vc90-d-2_4.pdb
+    File MSVC\giomm-vc80-d-2_4.dll
+    File MSVC\giomm-vc90-d-2_4.dll
+    File MSVC\giomm-vc80-d-2_4.pdb
+    File MSVC\giomm-vc90-d-2_4.pdb
   !endif
   
 SectionEnd
@@ -590,10 +606,14 @@
   File lib\libglibmm_generate_extra_defs-2.4.dll.a
   File /r lib\glibmm-2.4
   File /r lib\giomm-2.4
-  File MSVC\glibmm-2.4.lib
-  File MSVC\glibmm-2.4d.lib
-  File MSVC\giomm-2.4.lib
-  File MSVC\giomm-2.4d.lib
+  File MSVC\glibmm-vc80-2_4.lib
+  File MSVC\glibmm-vc90-2_4.lib
+  File MSVC\glibmm-vc80-d-2_4.lib
+  File MSVC\glibmm-vc90-d-2_4.lib
+  File MSVC\giomm-vc80-2_4.lib
+  File MSVC\giomm-vc90-2_4.lib
+  File MSVC\giomm-vc80-d-2_4.lib
+  File MSVC\giomm-vc90-d-2_4.lib
 
   SetOutPath $INSTDIR\lib\pkgconfig
   File lib\pkgconfig\glibmm-2.4.pc
@@ -630,11 +650,14 @@
 
   SetOutPath $INSTDIR\bin
   File ${BINDIR}\libpangomm-1.4-1.dll
-  File MSVC\pangomm-1.4.dll
+  File MSVC\pangomm-vc80-1_4.dll
+  File MSVC\pangomm-vc90-1_4.dll
 
   !ifndef RUNTIME_ONLY
-    File MSVC\pangomm-1.4d.dll
-    File MSVC\pangomm-1.4d.pdb
+    File MSVC\pangomm-vc80-d-1_4.dll
+    File MSVC\pangomm-vc90-d-1_4.dll
+    File MSVC\pangomm-vc80-d-1_4.pdb
+    File MSVC\pangomm-vc90-d-1_4.pdb
   !endif
 
 SectionEnd
@@ -650,8 +673,10 @@
   SetOutPath $INSTDIR\lib
   File lib\libpangomm-1.4.dll.a
   
-  File MSVC\pangomm-1.4.lib
-  File MSVC\pangomm-1.4d.lib
+  File MSVC\pangomm-vc80-1_4.lib
+  File MSVC\pangomm-vc90-1_4.lib
+  File MSVC\pangomm-vc80-d-1_4.lib
+  File MSVC\pangomm-vc90-d-1_4.lib
 
   SetOutPath $INSTDIR\lib\pkgconfig
   File lib\pkgconfig\pangomm-1.4.pc
@@ -688,17 +713,26 @@
   File ${BINDIR}\libgdkmm-2.4-1.dll
   File ${BINDIR}\libgtkmm-2.4-1.dll
 
-  File MSVC\atkmm-1.6.dll
-  File MSVC\gdkmm-2.4.dll
-  File MSVC\gtkmm-2.4.dll
+  File MSVC\atkmm-vc80-1_6.dll
+  File MSVC\atkmm-vc90-1_6.dll
+  File MSVC\gdkmm-vc80-2_4.dll
+  File MSVC\gdkmm-vc90-2_4.dll
+  File MSVC\gtkmm-vc80-2_4.dll
+  File MSVC\gtkmm-vc90-2_4.dll
 
   !ifndef RUNTIME_ONLY
-    File MSVC\atkmm-1.6d.dll
-    File MSVC\atkmm-1.6d.pdb
-    File MSVC\gdkmm-2.4d.dll
-    File MSVC\gdkmm-2.4d.pdb
-    File MSVC\gtkmm-2.4d.dll
-    File MSVC\gtkmm-2.4d.pdb
+    File MSVC\atkmm-vc80-d-1_6.dll
+    File MSVC\atkmm-vc90-d-1_6.dll
+    File MSVC\atkmm-vc80-d-1_6.pdb
+    File MSVC\atkmm-vc90-d-1_6.pdb
+    File MSVC\gdkmm-vc80-d-2_4.dll
+    File MSVC\gdkmm-vc90-d-2_4.dll
+    File MSVC\gdkmm-vc80-d-2_4.pdb
+    File MSVC\gdkmm-vc90-d-2_4.pdb
+    File MSVC\gtkmm-vc80-d-2_4.dll
+    File MSVC\gtkmm-vc90-d-2_4.dll
+    File MSVC\gtkmm-vc80-d-2_4.pdb
+    File MSVC\gtkmm-vc90-d-2_4.pdb
   !endif
   
 SectionEnd
@@ -720,12 +754,18 @@
   File /r lib\gtkmm-2.4
   File /r lib\gdkmm-2.4
   
-  File MSVC\atkmm-1.6.lib
-  File MSVC\atkmm-1.6d.lib
-  File MSVC\gdkmm-2.4.lib
-  File MSVC\gdkmm-2.4d.lib
-  File MSVC\gtkmm-2.4.lib
-  File MSVC\gtkmm-2.4d.lib
+  File MSVC\atkmm-vc80-1_6.lib
+  File MSVC\atkmm-vc90-1_6.lib
+  File MSVC\atkmm-vc80-d-1_6.lib
+  File MSVC\atkmm-vc90-d-1_6.lib
+  File MSVC\gdkmm-vc80-2_4.lib
+  File MSVC\gdkmm-vc90-2_4.lib
+  File MSVC\gdkmm-vc80-d-2_4.lib
+  File MSVC\gdkmm-vc90-d-2_4.lib
+  File MSVC\gtkmm-vc80-2_4.lib
+  File MSVC\gtkmm-vc90-2_4.lib
+  File MSVC\gtkmm-vc80-d-2_4.lib
+  File MSVC\gtkmm-vc90-d-2_4.lib
 
   SetOutPath $INSTDIR\lib\pkgconfig
   File lib\pkgconfig\atkmm-1.6.pc
@@ -733,9 +773,12 @@
   File lib\pkgconfig\gdkmm-2.4.pc
   
   SetOutPath $INSTDIR\MSVC
+  File MSVC\gtkmm-vc80-2_4.vsprops
+  File MSVC\gtkmm-vc90-2_4.vsprops
+  File MSVC\gtkmm-vc80-d-2_4.vsprops
+  File MSVC\gtkmm-vc90-d-2_4.vsprops
   File MSVC\gtkmm-2.4.vsprops
   File MSVC\gtkmm-2.4d.vsprops
-  
 
 SectionEnd
 
@@ -777,13 +820,16 @@
 
   SetOutPath $INSTDIR\bin
   File ${BINDIR}\libglademm-2.4-1.dll
-  File MSVC\glademm-2.4.dll
-  CreateShortCut "libglademm-2.4.dll.lnk" "glademm-2.4.dll"
+  File MSVC\glademm-vc80-2_4.dll
+  File MSVC\glademm-vc90-2_4.dll
+;  CreateShortCut "libglademm-2.4.dll.lnk" "glademm-2.4.dll"
   !ifndef RUNTIME_ONLY
-    File MSVC\glademm-2.4d.dll
-    CreateShortCut "libglademm-2.4d.dll.lnk" "glademm-2.4d.dll"
-    File MSVC\glademm-2.4d.pdb
-    CreateShortCut "libglademm-2.4d.pdb.lnk" "glademm-2.4d.pdb"
+    File MSVC\glademm-vc80-d-2_4.dll
+    File MSVC\glademm-vc90-d-2_4.dll
+;    CreateShortCut "libglademm-2.4d.dll.lnk" "glademm-2.4d.dll"
+    File MSVC\glademm-vc80-d-2_4.pdb
+    File MSVC\glademm-vc90-d-2_4.pdb
+;    CreateShortCut "libglademm-2.4d.pdb.lnk" "glademm-2.4d.pdb"
   !endif
   
 SectionEnd
@@ -799,11 +845,13 @@
   SetOutPath $INSTDIR\lib
   File lib\libglademm-2.4.dll.a
   File /r lib\libglademm-2.4
-  File MSVC\glademm-2.4.lib
-  File MSVC\glademm-2.4d.lib
+  File MSVC\glademm-vc80-2_4.lib
+  File MSVC\glademm-vc90-2_4.lib
+  File MSVC\glademm-vc80-d-2_4.lib
+  File MSVC\glademm-vc90-d-2_4.lib
 
-  CreateShortCut "libglademm-2.4.lib.lnk" "$INSTDIR\lib\glademm-2.4.lib"
-  CreateShortCut "libglademm-2.4d.lib.lnk" "$INSTDIR\lib\glademm-2.4d.lib"
+;  CreateShortCut "libglademm-2.4.lib.lnk" "$INSTDIR\lib\glademm-2.4.lib"
+;  CreateShortCut "libglademm-2.4d.lib.lnk" "$INSTDIR\lib\glademm-2.4d.lib"
 
   SetOutPath $INSTDIR\lib\pkgconfig
   File lib\pkgconfig\libglademm-2.4.pc
@@ -835,13 +883,16 @@
 
   SetOutPath $INSTDIR\bin
   File ${BINDIR}\libxml++-2.6-2.dll
-  File MSVC\xml++-2.6.dll
-  CreateShortCut "libxml++-2.6.dll.lnk" "xml++-2.6.dll"
+  File MSVC\xml++-vc80-2_6.dll
+  File MSVC\xml++-vc90-2_6.dll
+;  CreateShortCut "libxml++-2.6.dll.lnk" "xml++-2.6.dll"
   !ifndef RUNTIME_ONLY
-    File MSVC\xml++-2.6d.dll
-    CreateShortCut "libxml++-2.6d.dll.lnk" "xml++-2.6d.dll"
-    File MSVC\xml++-2.6d.pdb
-    CreateShortCut "libxml++-2.6d.pdb.lnk" "xml++-2.6d.pdb"
+    File MSVC\xml++-vc80-d-2_6.dll
+    File MSVC\xml++-vc90-d-2_6.dll
+;    CreateShortCut "libxml++-2.6d.dll.lnk" "xml++-2.6d.dll"
+    File MSVC\xml++-vc80-d-2_6.pdb
+    File MSVC\xml++-vc90-d-2_6.pdb
+;    CreateShortCut "libxml++-2.6d.pdb.lnk" "xml++-2.6d.pdb"
   !endif
 
 SectionEnd
@@ -857,11 +908,13 @@
   SetOutPath $INSTDIR\lib
   File lib\libxml++-2.6.dll.a
   File /r lib\libxml++-2.6
-  File MSVC\xml++-2.6.lib
-  File MSVC\xml++-2.6d.lib
+  File MSVC\xml++-vc80-2_6.lib
+  File MSVC\xml++-vc90-2_6.lib
+  File MSVC\xml++-vc80-d-2_6.lib
+  File MSVC\xml++-vc90-d-2_6.lib
 
-  CreateShortCut "libxml++-2.6.lib.lnk" "$INSTDIR\lib\xml++-2.6.lib"
-  CreateShortCut "libxml++-2.6d.lib.lnk" "$INSTDIR\lib\xml++-2.6.d.lib"
+;  CreateShortCut "libxml++-2.6.lib.lnk" "$INSTDIR\lib\xml++-2.6.lib"
+;  CreateShortCut "libxml++-2.6d.lib.lnk" "$INSTDIR\lib\xml++-2.6.d.lib"
 
   SetOutPath $INSTDIR\lib\pkgconfig
   File lib\pkgconfig\libxml++-2.6.pc
@@ -881,15 +934,15 @@
 SubSectionEnd
 
 !ifndef RUNTIME_ONLY
-Section "glade--" SecGlademm
-  SectionIn 1
-  SetOverwrite ifnewer
-
-  SetOutPath $INSTDIR\bin
-  File bin_stripped\glade--.exe
-  File bin_stripped\glademm-embed.exe
-
-SectionEnd
+;Section "glade--" SecGlademm
+;  SectionIn 1
+;  SetOverwrite ifnewer
+;
+;  SetOutPath $INSTDIR\bin
+;  File bin_stripped\glade--.exe
+;  File bin_stripped\glademm-embed.exe
+;
+;SectionEnd
 
 ;Section "gideon" SecGideon
 ;  SectionIn 1
@@ -914,9 +967,18 @@
 
 Section -Post SecPost
 
+  Strcmp $ISADMIN "1" 0 +3
+    IfSilent +2
+      !insertmacro MUI_INSTALLOPTIONS_READ $CONTEXT "SetContext.ini" "Field 2" "State"
+
+  ; TODO: Check that, if CONTEXT is set on silent install (meaning /ALLUSERS
+  ; was given on the command line), $ISADMIN is set as well, otherwise we
+  ; can't install for all users.
+
   ; Get rid of leftover start menus
-  StrCmp $ISADMIN "1" 0 +2
+  StrCmp $CONTEXT "1" 0 +3
   RMDir /r "$SMPROGRAMS\gtkmm for Mingw"
+  SetShellVarContext all
 
   ; Start Menu
   CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
@@ -932,7 +994,7 @@
   CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
 
   ; Registry + Add/Remove Entry
-  StrCmp $ISADMIN "1" 0 +11
+  StrCmp $CONTEXT "1" 0 +11
   WriteRegStr HKLM "Software\${PRODUCT_NAME}\${PRODUCT_API_VERSION}" "Path" "$INSTDIR"
   WriteRegStr HKLM "Software\${PRODUCT_NAME}\${PRODUCT_API_VERSION}" "Version" "${PRODUCT_VERSION}"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "${PRODUCT_FULLNAME} ${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}"
@@ -995,8 +1057,8 @@
   IfFileExists "$INSTDIR\share\doc\pangomm-1.4\docs\reference\html\index.html" "" +2
        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Documentation\pangomm Reference Manual.lnk" "$INSTDIR\share\doc\pangomm-1.4\docs\reference\html\index.html"
 
-  IfFileExists "$INSTDIR\share\doc\gtkmm-2.4\docs\index.html" "" +2
-       CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Documentation\gtkmm Reference Manual.lnk" "$INSTDIR\share\doc\gtkmm-2.4\docs\index.html"
+  IfFileExists "$INSTDIR\share\doc\gtkmm-2.4\docs\reference\html\index.html" "" +2
+       CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Documentation\gtkmm Reference Manual.lnk" "$INSTDIR\share\doc\gtkmm-2.4\docs\reference\html\index.html"
 
   IfFileExists "$INSTDIR\share\doc\gnomemm-2.6\libglademm-2.4\docs\reference\html\index.html" "" +2
        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Documentation\libglademm Reference Manual.lnk" "$INSTDIR\share\doc\gnomemm-2.6\libglademm-2.4\docs\reference\html\index.html"     
@@ -1008,7 +1070,7 @@
        Push $OUTDIR
        SetOutPath "$INSTDIR\gtkmm-demo"
        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Demo.lnk" "$INSTDIR\gtkmm-demo\gtkmm-demo.exe" "" "$INSTDIR\gtkmm.ico"
-       StrCmp $ISADMIN "1" 0 +4
+       StrCmp $CONTEXT "1" 0 +4
        WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gtkmm-demo.exe" "" "$INSTDIR\gtkmm-demo\gtkmm-demo.exe"
        WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gtkmm-demo.exe" "Path" "$INSTDIR\bin"
        Goto +3
@@ -1020,7 +1082,7 @@
 ;       Push $OUTDIR
 ;       SetOutPath "$INSTDIR\bin"
 ;       CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Gideon.lnk" "$INSTDIR\bin\gideon.exe" "" "$INSTDIR\gtkmm.ico"
-;       StrCmp $ISADMIN "1" 0 +4
+;       StrCmp $CONTEXT "1" 0 +4
 ;       WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gideon.exe" "" "$INSTDIR\bin\gideon.exe"
 ;       WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\gideon.exe" "Path" "$INSTDIR\bin"
 ;       Goto +3
@@ -1033,7 +1095,7 @@
   ; GTKMM_BASEPATH environment variable
   Push "GTKMM_BASEPATH"
   Push "$INSTDIR"
-  Push $ISADMIN
+  Push $CONTEXT
   Call WriteEnvStr
 
   ; Uninstaller
@@ -1045,7 +1107,7 @@
   ; Read a value from an InstallOptions INI file
   !insertmacro MUI_INSTALLOPTIONS_READ $CB_PATH_VALUE "PathQuestion.ini" "Field 1" "State"
   StrCmp $CB_PATH_VALUE "1" "" done
-     Push $ISADMIN
+     Push $CONTEXT
      Push "$INSTDIR\bin"
      Call AddToPath
 done:
@@ -1062,13 +1124,13 @@
   Pop $0
   StrCmp $0 "Admin" 0 done
   StrCpy $ISADMIN "1"
-  SetShellVarContext all
 done:
  
   ClearErrors
   ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName"
   IfErrors continue
   StrCpy $CONTEXT "1"
+  SetShellVarContext all
   StrCmp $ISADMIN "1" continue
   MessageBox MB_OK|MB_ICONEXCLAMATION "$(MISC_ADMIN_REQUIRED)"
   Quit
@@ -1290,9 +1352,9 @@
   Delete $INSTDIR\lib\gtkmm-*.lib
   Delete $INSTDIR\lib\pangomm-*.lib
   Delete $INSTDIR\lib\glademm-*.lib
-  Delete $INSTDIR\lib\libglademm-*.lib.lnk
+;  Delete $INSTDIR\lib\libglademm-*.lib.lnk
   Delete $INSTDIR\lib\xml++-*.lib
-  Delete $INSTDIR\lib\libxml++-*.lib.lnk
+;  Delete $INSTDIR\lib\libxml++-*.lib.lnk
 
   Delete $INSTDIR\lib\pkgconfig\libxml-2.0.pc
   Delete $INSTDIR\lib\pkgconfig\libpng.pc
@@ -1381,6 +1443,10 @@
   Delete $INSTDIR\share\aclocal\glibmm_check_perl.m4
   RMDir $INSTDIR\share\aclocal
   
+  Delete $INSTDIR\MSVC\gtkmm-vc80-2_4.vsprops
+  Delete $INSTDIR\MSVC\gtkmm-vc90-2_4.vsprops
+  Delete $INSTDIR\MSVC\gtkmm-vc80-d-2_4.vsprops
+  Delete $INSTDIR\MSVC\gtkmm-vc90-d-2_4.vsprops
   Delete $INSTDIR\MSVC\gtkmm-2.4.vsprops
   Delete $INSTDIR\MSVC\gtkmm-2.4d.vsprops
   RMDir $INSTDIR\MSVC
@@ -1478,9 +1544,9 @@
   Delete $INSTDIR\bin\gtkmm-*.dll
   Delete $INSTDIR\bin\pangomm-*.dll
   Delete $INSTDIR\bin\glademm-*.dll
-  Delete $INSTDIR\bin\libglademm-*.dll.lnk
+;  Delete $INSTDIR\bin\libglademm-*.dll.lnk
   Delete $INSTDIR\bin\xml++-*.dll
-  Delete $INSTDIR\bin\libxml++-*.dll.lnk
+;  Delete $INSTDIR\bin\libxml++-*.dll.lnk
   
   Delete $INSTDIR\bin\sigc-*.pdb
   Delete $INSTDIR\bin\cairomm-*.pdb
@@ -1491,9 +1557,9 @@
   Delete $INSTDIR\bin\gtkmm-*.pdb
   Delete $INSTDIR\bin\pangomm-*.pdb
   Delete $INSTDIR\bin\glademm-*.pdb
-  Delete $INSTDIR\bin\libglademm-*.pdb.lnk
+;  Delete $INSTDIR\bin\libglademm-*.pdb.lnk
   Delete $INSTDIR\bin\xml++-*.pdb
-  Delete $INSTDIR\bin\libxml++-*.pdb.lnk
+;  Delete $INSTDIR\bin\libxml++-*.pdb.lnk
   
   RMDir $INSTDIR\bin
   
@@ -1517,7 +1583,7 @@
 #  
   ; GTKMM_BASEPATH environment variable
   Push "GTKMM_BASEPATH"
-  Push $ISADMIN
+  Push $CONTEXT
   Call un.DeleteEnvStr
   
   ; uninstaller
@@ -1566,7 +1632,7 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecLibxmlDevelopment} "libxml++ development headers and import libraries"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecLibxmlDocumentation} "libxml++ Documentation"
   
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGlademm} "glade-- executable"
+;  !insertmacro MUI_DESCRIPTION_TEXT ${SecGlademm} "glade-- executable"
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${SecGideon} "gideon executable"
 !endif
   
@@ -1614,7 +1680,7 @@
   !insertmacro UnselectSection ${SecLibxmlDevelopment}
   !insertmacro UnselectSection ${SecLibxmlDocumentation}
   
-  !insertmacro UnselectSection ${SecGlademm}
+;  !insertmacro UnselectSection ${SecGlademm}
 ;  !insertmacro UnselectSection ${SecGideon}
 !endif
   
@@ -1661,7 +1727,7 @@
   !insertmacro SelectSection ${SecLibxmlDevelopment}
   !insertmacro SelectSection ${SecLibxmlDocumentation}
   
-  !insertmacro SelectSection ${SecGlademm}
+;  !insertmacro SelectSection ${SecGlademm}
 ;  !insertmacro SelectSection ${SecGideon}
 !endif
   
@@ -1701,20 +1767,15 @@
   Pop $1
   StrCmp $1 "Admin" 0 done
 continue:
-  IfSilent "" +5
-    StrCmp $CONTEXT "1" "" done
-    StrCpy $ISADMIN "1"
-    SetShellVarContext all
+  StrCpy $ISADMIN "1"
+  IfSilent "" +2
     Goto done
+
   !insertmacro MUI_HEADER_TEXT "$(MISC_INSTALL_OPTION)" "$(MISC_UNINSTALL_CONTEXT)"
   !insertmacro MUI_INSTALLOPTIONS_WRITE "SetContext.ini" "Field 1" "Text" "$(GTKMM_RIGHTS_INSTALL)"
   !insertmacro MUI_INSTALLOPTIONS_WRITE "SetContext.ini" "Field 2" "Text" "$(GTKMM_RIGHTS_ANYONE)"
   !insertmacro MUI_INSTALLOPTIONS_WRITE "SetContext.ini" "Field 3" "Text" "$(GTKMM_RIGHTS_CURRENT)"
   !insertmacro MUI_INSTALLOPTIONS_DISPLAY "SetContext.ini"
-  !insertmacro MUI_INSTALLOPTIONS_READ $R0 "SetContext.ini" "Field 2" "State"
-  StrCmp $R0 "1" "" done
-  StrCpy $ISADMIN "1"
-  SetShellVarContext all
 done:
   
 FunctionEnd

Copied: trunk/win32_installer/gtkmm-vc80-2_4.vsprops (from r1048, /trunk/win32_installer/gtkmm-2.4.vsprops)
==============================================================================
--- /trunk/win32_installer/gtkmm-2.4.vsprops	(original)
+++ trunk/win32_installer/gtkmm-vc80-2_4.vsprops	Sun Oct 12 20:56:06 2008
@@ -11,7 +11,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="glademm-2.4.lib xml++-2.6.lib gtkmm-2.4.lib glade-2.0.lib gdkmm-2.4.lib atkmm-1.6.lib pangomm-1.4.lib giomm-2.4.lib glibmm-2.4.lib cairomm-1.0.lib sigc-2.0.lib gtk-win32-2.0.lib libxml2.lib gdk-win32-2.0.lib atk-1.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gio-2.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib iconv.lib"
+		AdditionalDependencies="glademm-vc80-2_4.lib xml++-vc80-2_6.lib gtkmm-vc80-2_4.lib glade-2.0.lib gdkmm-vc80-2_4.lib atkmm-vc80-1_6.lib pangomm-vc80-1_4.lib giomm-vc80-2_4.lib glibmm-vc80-2_4.lib cairomm-vc80-1_0.lib sigc-vc80-2_0.lib gtk-win32-2.0.lib libxml2.lib gdk-win32-2.0.lib atk-1.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gio-2.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib iconv.lib"
 		AdditionalLibraryDirectories="$(GTKMM_BASEPATH)\lib"
 	/>
 </VisualStudioPropertySheet>

Copied: trunk/win32_installer/gtkmm-vc80-d-2_4.vsprops (from r1048, /trunk/win32_installer/gtkmm-2.4d.vsprops)
==============================================================================
--- /trunk/win32_installer/gtkmm-2.4d.vsprops	(original)
+++ trunk/win32_installer/gtkmm-vc80-d-2_4.vsprops	Sun Oct 12 20:56:06 2008
@@ -11,7 +11,7 @@
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="glademm-2.4d.lib xml++-2.6d.lib gtkmm-2.4d.lib glade-2.0.lib gdkmm-2.4d.lib atkmm-1.6d.lib pangomm-1.4d.lib giomm-2.4d.lib glibmm-2.4d.lib cairomm-1.0d.lib sigc-2.0d.lib gtk-win32-2.0.lib libxml2.lib gdk-win32-2.0.lib atk-1.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gio-2.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib iconv.lib"
+		AdditionalDependencies="glademm-vc80-d-2_4.lib xml++-vc80-d-2_6.lib gtkmm-vc80-d-2_4.lib glade-2.0.lib gdkmm-vc80-d-2_4.lib atkmm-vc80-d-1_6.lib pangomm-vc80-d-1_4.lib giomm-vc80-d-2_4.lib glibmm-vc80-d-2_4.lib cairomm-vc80-d-1_0.lib sigc-vc80-d-2_0.lib gtk-win32-2.0.lib libxml2.lib gdk-win32-2.0.lib atk-1.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gio-2.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib iconv.lib"
 		AdditionalLibraryDirectories="$(GTKMM_BASEPATH)\lib"
 	/>
 </VisualStudioPropertySheet>

Added: trunk/win32_installer/gtkmm-vc90-2_4.vsprops
==============================================================================
--- (empty file)
+++ trunk/win32_installer/gtkmm-vc90-2_4.vsprops	Sun Oct 12 20:56:06 2008
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gtkmm 2.4 Release"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalOptions="/vd2"
+		AdditionalIncludeDirectories="&quot;$(GTKMM_BASEPATH)\include\libglademm-2.4\&quot;;&quot;$(GTKMM_BASEPATH)\lib\libglademm-2.4\include&quot;;&quot;$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include&quot;;&quot;$(GTKMM_BASEPATH)\include\gtkmm-2.4&quot;;&quot;$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include&quot;;&quot;$(GTKMM_BASEPATH)\include\gdkmm-2.4&quot;;&quot;$(GTKMM_BASEPATH)\include\pangomm-1.4&quot;;&quot;$(GTKMM_BASEPATH)\include\atkmm-1.6&quot;;&quot;$(GTKMM_BASEPATH)\lib\libxml++-2.6\include&quot;;&quot;$(GTKMM_BASEPATH)\include\libxml++-2.6&quot;;&quot;$(GTKMM_BASEPATH)\lib\giomm-2.4\include&quot;;&quot;$(GTKMM_BASEPATH)\include\giomm-2.4&quot;;&quot;$(GTKMM_BASEPATH)\lib\glibmm-2.4\include&quot;;&quot;$(GTKMM_BASEPATH)\include\glibmm-2.4&quot;;&quot;$(GTKMM_BASEPATH)\include\cairomm-1.0&quot;;&quot;$(GTKMM_BASEPATH)\lib\sigc++-2.0\include&quot;;&quot;$(GTKMM_BASEPATH)\include\sigc++-2.0&quot;;&quot;$(GTKMM_BASEPATH)\include\libglade-2.0&quot;;&quot;$(GTKMM_BASEPATH)\lib\gtk-2.0\i
 nclude&quot;;&quot;$(GTKMM_BASEPATH)\include\gtk-2.0&quot;;&quot;$(GTKMM_BASEPATH)\include\pango-1.0&quot;;&quot;$(GTKMM_BASEPATH)\include\atk-1.0&quot;;&quot;$(GTKMM_BASEPATH)\lib\glib-2.0\include&quot;;&quot;$(GTKMM_BASEPATH)\include\glib-2.0&quot;;&quot;$(GTKMM_BASEPATH)\include\libxml2&quot;;&quot;$(GTKMM_BASEPATH)\include\cairo&quot;;&quot;$(GTKMM_BASEPATH)\include&quot;"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="glademm-vc90-2_4.lib xml++-vc90-2_6.lib gtkmm-vc90-2_4.lib glade-2.0.lib gdkmm-vc90-2_4.lib atkmm-vc90-1_6.lib pangomm-vc90-1_4.lib giomm-vc90-2_4.lib glibmm-vc90-2_4.lib cairomm-vc90-1_0.lib sigc-vc90-2_0.lib gtk-win32-2.0.lib libxml2.lib gdk-win32-2.0.lib atk-1.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gio-2.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib iconv.lib"
+		AdditionalLibraryDirectories="$(GTKMM_BASEPATH)\lib"
+	/>
+</VisualStudioPropertySheet>

Added: trunk/win32_installer/gtkmm-vc90-d-2_4.vsprops
==============================================================================
--- (empty file)
+++ trunk/win32_installer/gtkmm-vc90-d-2_4.vsprops	Sun Oct 12 20:56:06 2008
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gtkmm 2.4 Debug"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalOptions="/vd2"
+		AdditionalIncludeDirectories="&quot;$(GTKMM_BASEPATH)\include\libglademm-2.4\&quot;;&quot;$(GTKMM_BASEPATH)\lib\libglademm-2.4\include&quot;;&quot;$(GTKMM_BASEPATH)\lib\gtkmm-2.4\include&quot;;&quot;$(GTKMM_BASEPATH)\include\gtkmm-2.4&quot;;&quot;$(GTKMM_BASEPATH)\lib\gdkmm-2.4\include&quot;;&quot;$(GTKMM_BASEPATH)\include\gdkmm-2.4&quot;;&quot;$(GTKMM_BASEPATH)\include\pangomm-1.4&quot;;&quot;$(GTKMM_BASEPATH)\include\atkmm-1.6&quot;;&quot;$(GTKMM_BASEPATH)\lib\libxml++-2.6\include&quot;;&quot;$(GTKMM_BASEPATH)\include\libxml++-2.6&quot;;&quot;$(GTKMM_BASEPATH)\lib\giomm-2.4\include&quot;;&quot;$(GTKMM_BASEPATH)\include\giomm-2.4&quot;;&quot;$(GTKMM_BASEPATH)\lib\glibmm-2.4\include&quot;;&quot;$(GTKMM_BASEPATH)\include\glibmm-2.4&quot;;&quot;$(GTKMM_BASEPATH)\include\cairomm-1.0&quot;;&quot;$(GTKMM_BASEPATH)\lib\sigc++-2.0\include&quot;;&quot;$(GTKMM_BASEPATH)\include\sigc++-2.0&quot;;&quot;$(GTKMM_BASEPATH)\include\libglade-2.0&quot;;&quot;$(GTKMM_BASEPATH)\lib\gtk-2.0\i
 nclude&quot;;&quot;$(GTKMM_BASEPATH)\include\gtk-2.0&quot;;&quot;$(GTKMM_BASEPATH)\include\pango-1.0&quot;;&quot;$(GTKMM_BASEPATH)\include\atk-1.0&quot;;&quot;$(GTKMM_BASEPATH)\lib\glib-2.0\include&quot;;&quot;$(GTKMM_BASEPATH)\include\glib-2.0&quot;;&quot;$(GTKMM_BASEPATH)\include\libxml2&quot;;&quot;$(GTKMM_BASEPATH)\include\cairo&quot;;&quot;$(GTKMM_BASEPATH)\include&quot;"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="glademm-vc90-d-2_4.lib xml++-vc90-d-2_6.lib gtkmm-vc90-d-2_4.lib glade-2.0.lib gdkmm-vc90-d-2_4.lib atkmm-vc90-d-1_6.lib pangomm-vc90-d-1_4.lib giomm-vc90-d-2_4.lib glibmm-vc90-d-2_4.lib cairomm-vc90-d-1_0.lib sigc-vc90-d-2_0.lib gtk-win32-2.0.lib libxml2.lib gdk-win32-2.0.lib atk-1.0.lib gdk_pixbuf-2.0.lib pangowin32-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gio-2.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib intl.lib iconv.lib"
+		AdditionalLibraryDirectories="$(GTKMM_BASEPATH)\lib"
+	/>
+</VisualStudioPropertySheet>

Modified: trunk/win32_installer/install-msvc-module
==============================================================================
--- trunk/win32_installer/install-msvc-module	(original)
+++ trunk/win32_installer/install-msvc-module	Sun Oct 12 20:56:06 2008
@@ -4,6 +4,7 @@
 # gtkmm into the MSVC subdirectory
 
 module=$1
+toolset=$2
 
 # Assume all the other libraries are at same point as gtkmm:
 basepath=../..
@@ -13,54 +14,65 @@
 	# Path to extracted tarball or SVN checkout
 	sourcepath="${basepath}/libsigc++"
 	# Basename of DLL
-	basename='sigc-2.0'
+	basename='sigc'
+	# Version tag of DLL name
+	vername='2_0'
 	# Abiname of package
 	abiname='sigc++-2.0'
 	# Subdirectory in MSVC_Net2005
 	subdir='.'
 elif test $module = 'glibmm'; then
 	sourcepath="${basepath}/glibmm-2.18.0"
-	basename='glibmm-2.4'
+	basename='glibmm'
+	vername='2_4'
 	abiname='glibmm-2.4'
 	subdir='glibmm'
 elif test $module = 'giomm'; then
 	sourcepath="${basepath}/glibmm-2.18.0"
-	basename='giomm-2.4'
+	basename='giomm'
+	vername='2_4'
 	abiname='giomm-2.4'
 	subdir='giomm'
 elif test $module = 'cairomm'; then
-	sourcepath="${basepath}/cairomm_msvc"
-	basename='cairomm-1.0'
+	sourcepath="${basepath}/cairomm-1.6.4"
+	basename='cairomm'
+	vername='1_0'
 	abiname='cairomm-1.0'
 	subdir='cairomm'
 elif test $module = 'pangomm'; then
 	sourcepath="${basepath}/pangomm-2.14.0"
-	basename='pangomm-1.4'
+	basename='pangomm'
+	vername='1_4'
 	abiname='pangomm-1.4'
 	subdir='pangomm'
 elif test $module = 'atkmm'; then
 	sourcepath="${basepath}/gtkmm-2.14.1"
-	basename='atkmm-1.6'
+	basename='atkmm'
+	vername='1_6'
 	abiname='atkmm-1.6'
 	subdir='atkmm'
 elif test $module = 'gdkmm'; then
 	sourcepath="${basepath}/gtkmm-2.14.1"
-	basename='gdkmm-2.4'
+	basename='gdkmm'
+	vername='2_4'
 	abiname='gdkmm-2.4'
 	subdir='gdkmm'
 elif test $module = 'gtkmm'; then
 	sourcepath="${basepath}/gtkmm-2.14.1"
-	basename='gtkmm-2.4'
+	basename='gtkmm'
+	vername='2_4'
 	abiname='gtkmm-2.4'
 	subdir='gtkmm'
 elif test $module = 'libglademm'; then
 	sourcepath="${basepath}/libglademm-2.6.7"
-	basename='glademm-2.4'
+	basename='glademm'
+	vername='2_4'
 	abiname='glademm-2.4'
 	subdir='libglademm'
 elif test $module = 'libxml++'; then
 	sourcepath="${basepath}/libxml++-2.24.0"
-	basename='xml++-2.6'
+	basename='xml++'
+	vername='2_6'
 	abiname='libxml++-2.6'
 	subdir='libxml++'
 else
@@ -68,6 +80,15 @@
 	exit -1
 fi
 
+if test $toolset = 'vc80'; then
+	vcdir='MSVC_Net2005'
+elif test $toolset = 'vc90'; then
+	vcdir='MSVC_Net2008'
+else
+	echo "Toolset $toolset not known"
+	exit -1
+fi
+
 #echo "Source Path: $sourcepath"
 #echo "Basename: $basename"
 #echo "Abiname: $abiname"
@@ -76,13 +97,13 @@
 targetpath=MSVC
 
 mkdir -p ${targetpath} || exit -1
-cp $sourcepath/MSVC_Net2005/$subdir/Release/${basename}.dll $targetpath || exit -1
-cp $sourcepath/MSVC_Net2005/$subdir/Debug/${basename}d.dll $targetpath || exit -1
-cp $sourcepath/MSVC_Net2005/$subdir/Debug/${basename}d.pdb $targetpath || exit -1
+cp $sourcepath/$vcdir/$subdir/Release/${basename}-${toolset}-${vername}.dll $targetpath || exit -1
+cp $sourcepath/$vcdir/$subdir/Debug/${basename}-${toolset}-d-${vername}.dll $targetpath || exit -1
+cp $sourcepath/$vcdir/$subdir/Debug/${basename}-${toolset}-d-${vername}.pdb $targetpath || exit -1
 
 mkdir -p ${targetpath}/lib || exit -1
-cp $sourcepath/MSVC_Net2005/$subdir/Release/${basename}.lib $targetpath || exit -1
-cp $sourcepath/MSVC_Net2005/$subdir/Debug/${basename}d.lib $targetpath || exit -1
+cp $sourcepath/$vcdir/$subdir/Release/${basename}-${toolset}-${vername}.lib $targetpath || exit -1
+cp $sourcepath/$vcdir/$subdir/Debug/${basename}-${toolset}-d-${vername}.lib $targetpath || exit -1
 
 # Configfile is used from mingw, thus commented out:
 #configfile=$sourcepath/MSVC_Net2005/$subdir/*config.h
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]