[json-glib] Update Visual Studio property sheets
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [json-glib] Update Visual Studio property sheets
- Date: Mon, 23 May 2011 01:24:54 +0000 (UTC)
commit 8d98b99b945423085232d358492e97399c9fd071
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon May 23 09:39:20 2011 +0800
Update Visual Studio property sheets
-Make DLL/LIB versioning more like the autotools-compiled versions
-"Install" the headers in a more consistent way like the autotools versions
build/win32/vs10/json-glib.props | 26 +++++++++++++-------------
build/win32/vs9/json-glib.vsprops | 32 ++++++++++++++++----------------
2 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/build/win32/vs10/json-glib.props b/build/win32/vs10/json-glib.props
index d4c6286..c13f49b 100644
--- a/build/win32/vs10/json-glib.props
+++ b/build/win32/vs10/json-glib.props
@@ -3,6 +3,7 @@
<PropertyGroup Label="UserMacros">
<GlibEtcInstallRoot>..\..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+ <JsonGlibVersion>1.0</JsonGlibVersion>
<PrepBuild>
if exist ..\..\..\config.h goto DONE_CONFIG_H
@@ -29,36 +30,35 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
copy ..\..\..\json-glib\tests\stream-load.json $(CopyDir)\bin
-mkdir $(CopyDir)\include\json-glib
+mkdir $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
-copy ..\..\..\json-glib\json-enum-types.h $(CopyDir)\include\json-glib
+copy ..\..\..\json-glib\json-enum-types.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
-copy ..\..\..\json-glib\json-version.h $(CopyDir)\include\json-glib
+copy ..\..\..\json-glib\json-version.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
-copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib
+copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
-copy ..\..\..\json-glib\json-builder.h $(CopyDir)\include\json-glib
+copy ..\..\..\json-glib\json-builder.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
-copy ..\..\..\json-glib\json-generator.h $(CopyDir)\include\json-glib
+copy ..\..\..\json-glib\json-generator.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
-copy ..\..\..\json-glib\json-gobject.h $(CopyDir)\include\json-glib
+copy ..\..\..\json-glib\json-gobject.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
-copy ..\..\..\json-glib\json-parser.h $(CopyDir)\include\json-glib
+copy ..\..\..\json-glib\json-parser.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
-copy ..\..\..\json-glib\json-reader.h $(CopyDir)\include\json-glib
+copy ..\..\..\json-glib\json-reader.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
-copy ..\..\..\json-glib\json-types.h $(CopyDir)\include\json-glib
+copy ..\..\..\json-glib\json-types.h $(CopyDir)\include\json-glib-$(JsonGlibVersion)\json-glib
</JsonGlibDoInstall>
<JsonGlibGenerateDef>echo EXPORTS >"..\..\..\json-glib\json-glib.def" && cl /EP ..\..\..\json-glib\json-glib.symbols >>"..\..\..\json-glib\json-glib.def"</JsonGlibGenerateDef>
- <JsonGlibVersion>0.0</JsonGlibVersion>
<JsonGlibDefines>JSON_COMPILATION;G_LOG_DOMAIN="Json"</JsonGlibDefines>
<JsonGlibLibtoolCompatibleDllPrefix>lib</JsonGlibLibtoolCompatibleDllPrefix>
- <JsonGlibLibtoolCompatibleDllSuffix>-0.0-0</JsonGlibLibtoolCompatibleDllSuffix>
+ <JsonGlibLibtoolCompatibleDllSuffix>-1.0-0</JsonGlibLibtoolCompatibleDllSuffix>
<JsonGlibSeparateVS10DllPrefix />
- <JsonGlibSeparateVS10DllSuffix>-0-vs10</JsonGlibSeparateVS10DllSuffix>
+ <JsonGlibSeparateVS10DllSuffix>-1-vs10</JsonGlibSeparateVS10DllSuffix>
<JsonGlibDllPrefix>$(JsonGlibSeparateVS10DllPrefix)</JsonGlibDllPrefix>
<JsonGlibDllSuffix>$(JsonGlibSeparateVS10DllSuffix)</JsonGlibDllSuffix>
</PropertyGroup>
diff --git a/build/win32/vs9/json-glib.vsprops b/build/win32/vs9/json-glib.vsprops
index 3511005..b0fd9e9 100644
--- a/build/win32/vs9/json-glib.vsprops
+++ b/build/win32/vs9/json-glib.vsprops
@@ -26,6 +26,10 @@ copy ..\config.h.win32 ..\..\..\config.h

"
/>
<UserMacro
+ Name="JsonGlibVersion"
+ Value="1.0"
+ />
+ <UserMacro
Name="JsonGlibDoInstall"
Value="
mkdir $(OutDir)

@@ -38,18 +42,18 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&
copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin

copy ..\..\..\json-glib\tests\stream-load.json $(OutDir)\bin

-mkdir $(OutDir)\include\json-glib

+mkdir $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib

-copy ..\..\..\json-glib\json-enum-types.h $(OutDir)\include\json-glib

-copy ..\..\..\json-glib\json-version.h $(OutDir)\include\json-glib

-copy ..\..\..\json-glib\json-glib.h $(OutDir)\include\json-glib

+copy ..\..\..\json-glib\json-enum-types.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib

+copy ..\..\..\json-glib\json-version.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib

+copy ..\..\..\json-glib\json-glib.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib

-copy ..\..\..\json-glib\json-builder.h $(OutDir)\include\json-glib

-copy ..\..\..\json-glib\json-generator.h $(OutDir)\include\json-glib

-copy ..\..\..\json-glib\json-gobject.h $(OutDir)\include\json-glib

-copy ..\..\..\json-glib\json-parser.h $(OutDir)\include\json-glib

-copy ..\..\..\json-glib\json-reader.h $(OutDir)\include\json-glib

-copy ..\..\..\json-glib\json-types.h $(OutDir)\include\json-glib

+copy ..\..\..\json-glib\json-builder.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib

+copy ..\..\..\json-glib\json-generator.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib

+copy ..\..\..\json-glib\json-gobject.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib

+copy ..\..\..\json-glib\json-parser.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib

+copy ..\..\..\json-glib\json-reader.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib

+copy ..\..\..\json-glib\json-types.h $(OutDir)\include\json-glib-$(JsonGlibVersion)\json-glib

"
/>
<UserMacro
@@ -57,10 +61,6 @@ copy ..\..\..\json-glib\json-types.h $(OutDir)\include\json-glib

Value="echo EXPORTS >"..\..\..\json-glib\json-glib.def" && cl /EP ..\..\..\json-glib\json-glib.symbols >>"..\..\..\json-glib\json-glib.def""
/>
<UserMacro
- Name="JsonGlibVersion"
- Value="0.0"
- />
- <UserMacro
Name="JsonGlibDefines"
Value="JSON_COMPILATION;G_LOG_DOMAIN=\"Json\""
/>
@@ -70,7 +70,7 @@ copy ..\..\..\json-glib\json-types.h $(OutDir)\include\json-glib

/>
<UserMacro
Name="JsonGlibLibtoolCompatibleDllSuffix"
- Value="-0.0-0"
+ Value="-1.0-0"
/>
<UserMacro
Name="JsonGlibSeparateVS9DllPrefix"
@@ -78,7 +78,7 @@ copy ..\..\..\json-glib\json-types.h $(OutDir)\include\json-glib

/>
<UserMacro
Name="JsonGlibSeparateVS9DllSuffix"
- Value="-0-vs9"
+ Value="-1-vs9"
/>
<!-- Change these two to JsonGlibLibtoolCompatibleDllPrefix and
JsonGlibLibtoolCompatibleDllSuffix if that is what you want -->
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
