[gtksourceview] Visual Studio builds: Fix "install"



commit 37f8876238df614d0b933257d4e703ca4f1dd721
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Mar 9 18:25:37 2017 +0800

    Visual Studio builds: Fix "install"
    
    The file names for the .dll/.pdb were not set correctly in the property
    sheets, so correct them so that they would get copied correctly.
    
    Also correct the 201x roperty sheet where the included property sheet
    was not correctly updated.

 win32/vs10/gtksourceview4-install.propsin         |    6 +++---
 win32/vs10/gtksourceview4-version-paths.props.in  |    2 +-
 win32/vs9/gtksourceview4-install.vspropsin        |    4 ++--
 win32/vs9/gtksourceview4-version-paths.vsprops.in |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/win32/vs10/gtksourceview4-install.propsin b/win32/vs10/gtksourceview4-install.propsin
index b6747ad..57a4a76 100644
--- a/win32/vs10/gtksourceview4-install.propsin
+++ b/win32/vs10/gtksourceview4-install.propsin
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <ImportGroup Label="PropertySheets">
-    <Import Project="gtksourceview-build-defines.props" />
+    <Import Project="gtksourceview4-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <GtkSourceviewDoInstall>
 mkdir $(CopyDir)
 mkdir $(CopyDir)\bin
-copy 
$(SolutionDir)$(Configuration)\$(Platform)\bin\$(GtkSourceviewDllPrefix)gtksourceview$(GtkSourceviewDllSuffix).dll
 $(CopyDir)\bin
-copy 
$(SolutionDir)$(Configuration)\$(Platform)\bin\$(GtkSourceviewDllPrefix)gtksourceview$(GtkSourceviewDllSuffix).pdb
 $(CopyDir)\bin
+copy 
$(SolutionDir)$(Configuration)\$(Platform)\bin\$(GtkSourceviewDllPrefix)gtksourceview-$(ApiVersion)$(GtkSourceviewDllSuffix).dll
 $(CopyDir)\bin
+copy 
$(SolutionDir)$(Configuration)\$(Platform)\bin\$(GtkSourceviewDllPrefix)gtksourceview-$(ApiVersion)$(GtkSourceviewDllSuffix).pdb
 $(CopyDir)\bin
 
 mkdir $(CopyDir)\include\gtksourceview-$(ApiVersion)\gtksourceview\completion-providers\words
 #include "gtksourceview-4.vs10.headers"
diff --git a/win32/vs10/gtksourceview4-version-paths.props.in 
b/win32/vs10/gtksourceview4-version-paths.props.in
index c41edbf..af7c606 100644
--- a/win32/vs10/gtksourceview4-version-paths.props.in
+++ b/win32/vs10/gtksourceview4-version-paths.props.in
@@ -10,7 +10,7 @@
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
     <GtkSourceviewLibtoolCompatibleDllPrefix>lib</GtkSourceviewLibtoolCompatibleDllPrefix>
-    <GtkSourceviewLibtoolCompatibleDllSuffix>-$(ApiVersion).0-0</GtkSourceviewLibtoolCompatibleDllSuffix>
+    <GtkSourceviewLibtoolCompatibleDllSuffix>.0-0</GtkSourceviewLibtoolCompatibleDllSuffix>
     <GtkSourceviewSeparateVSDllPrefix />
     <GtkSourceviewSeparateVSDllSuffix>-vs$(VSVer)</GtkSourceviewSeparateVSDllSuffix>
     <GtkSourceviewDllPrefix>$(GtkSourceviewSeparateVSDllPrefix)</GtkSourceviewDllPrefix>
diff --git a/win32/vs9/gtksourceview4-install.vspropsin b/win32/vs9/gtksourceview4-install.vspropsin
index 42067af..fcd62a5 100644
--- a/win32/vs9/gtksourceview4-install.vspropsin
+++ b/win32/vs9/gtksourceview4-install.vspropsin
@@ -10,8 +10,8 @@
                Value="
 mkdir $(CopyDir)&#x0D;&#x0A;
 mkdir $(CopyDir)\bin&#x0D;&#x0A;
-copy 
$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GtkSourceviewDllPrefix)gtksourceview$(GtkSourceviewDllSuffix).dll
 $(CopyDir)\bin&#x0D;&#x0A;
-copy 
$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GtkSourceviewDllPrefix)gtksourceview$(GtkSourceviewDllSuffix).pdb
 $(CopyDir)\bin&#x0D;&#x0A;
+copy 
$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GtkSourceviewDllPrefix)gtksourceview-$(ApiVersion)$(GtkSourceviewDllSuffix).dll
 $(CopyDir)\bin&#x0D;&#x0A;
+copy 
$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(GtkSourceviewDllPrefix)gtksourceview-$(ApiVersion)$(GtkSourceviewDllSuffix).pdb
 $(CopyDir)\bin&#x0D;&#x0A;
 
 mkdir $(CopyDir)\include\gtksourceview-$(ApiVersion)\gtksourceview\completion-providers\words&#x0D;&#x0A;
 #include "gtksourceview-4.headers"
diff --git a/win32/vs9/gtksourceview4-version-paths.vsprops.in 
b/win32/vs9/gtksourceview4-version-paths.vsprops.in
index b045aa9..24da317 100644
--- a/win32/vs9/gtksourceview4-version-paths.vsprops.in
+++ b/win32/vs9/gtksourceview4-version-paths.vsprops.in
@@ -46,7 +46,7 @@
        />
        <UserMacro
                Name="GtkSourceviewLibtoolCompatibleDllSuffix"
-               Value="-$(ApiVersion).0-0"
+               Value=".0-0"
        />
        <UserMacro
                Name="GtkSourceviewSeparateVSDllPrefix"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]