[gtksourceview] Visual Studio 2010+ builds: Force "re-install" on rebuilds



commit 94248249d376efb6dd738f934b4eeb017d73ab82
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Jan 8 16:04:45 2016 +0800

    Visual Studio 2010+ builds: Force "re-install" on rebuilds
    
    This makes it easier to test builds, and also silence MSBuild warnings...

 build/win32/vs10/gtksourceview-gen-srcs.props.in |   12 ++-------
 build/win32/vs10/gtksourceview-install.vcxproj   |   28 ++++++++++++---------
 2 files changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/build/win32/vs10/gtksourceview-gen-srcs.props.in 
b/build/win32/vs10/gtksourceview-gen-srcs.props.in
index 0c552e6..a58a67f 100644
--- a/build/win32/vs10/gtksourceview-gen-srcs.props.in
+++ b/build/win32/vs10/gtksourceview-gen-srcs.props.in
@@ -5,18 +5,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH>
-    <GenerateEnums>
-cd ..
-
+    <GenerateEnums>cd ..
 CALL gen-enums.bat $(GlibEtcInstallRoot)
-
 cd $(SolutionDir)
     </GenerateEnums>
-    <GenerateRsrcSrc>
-$(GlibEtcInstallRoot)\bin\glib-compile-resources --target=..\..\..\gtksourceview\gtksourceview-resources.c 
--generate-source --sourcedir=..\..\..\gtksourceview ..\..\..\gtksourceview\gtksourceview.gresource.xml
-    </GenerateRsrcSrc>
-    <GenGtksourceVersionH>
-$(PythonPath)\python.exe ..\replace.py --action=replace-var 
--input=..\..\..\gtksourceview\gtksourceversion.h.in --output=..\..\..\gtksourceview\gtksourceversion.h.tmp1 
--var=GTK_SOURCE_MAJOR_VERSION --outstring= GTK_SOURCE_MAJOR_VERSION@
+    <GenerateRsrcSrc>$(GlibEtcInstallRoot)\bin\glib-compile-resources 
--target=..\..\..\gtksourceview\gtksourceview-resources.c --generate-source 
--sourcedir=..\..\..\gtksourceview ..\..\..\gtksourceview\gtksourceview.gresource.xml</GenerateRsrcSrc>
+    <GenGtksourceVersionH>$(PythonPath)\python.exe ..\replace.py --action=replace-var 
--input=..\..\..\gtksourceview\gtksourceversion.h.in --output=..\..\..\gtksourceview\gtksourceversion.h.tmp1 
--var=GTK_SOURCE_MAJOR_VERSION --outstring= GTK_SOURCE_MAJOR_VERSION@
 $(PythonPath)\python.exe ..\replace.py --action=replace-var 
--input=..\..\..\gtksourceview\gtksourceversion.h.tmp1 
--output=..\..\..\gtksourceview\gtksourceversion.h.tmp2 --var=GTK_SOURCE_MINOR_VERSION --outstring= 
GTK_SOURCE_MINOR_VERSION@
 $(PythonPath)\python.exe ..\replace.py --action=replace-var 
--input=..\..\..\gtksourceview\gtksourceversion.h.tmp2 --output=..\..\..\gtksourceview\gtksourceversion.h 
--var=GTK_SOURCE_MICRO_VERSION --outstring= GTK_SOURCE_MICRO_VERSION@
 del ..\..\..\gtksourceview\gtksourceversion.h.tmp1 ..\..\..\gtksourceview\gtksourceversion.h.tmp2
diff --git a/build/win32/vs10/gtksourceview-install.vcxproj b/build/win32/vs10/gtksourceview-install.vcxproj
index 635c6ab..45d1dfd 100644
--- a/build/win32/vs10/gtksourceview-install.vcxproj
+++ b/build/win32/vs10/gtksourceview-install.vcxproj
@@ -77,24 +77,12 @@
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>$(GtkSourceviewDoInstall)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>$(GtkSourceviewDoInstall)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>$(GtkSourceviewDoInstall)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>$(GtkSourceviewDoInstall)</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="gtksourceview.vcxproj">
@@ -102,6 +90,22 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\config.h.win32">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying build results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkSourceviewDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\blah;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying build results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkSourceviewDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\blah;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying build results...</Message>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkSourceviewDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\blah;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying build results...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkSourceviewDoInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\blah;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>


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