luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 15:03:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Visual Studio builds: Redo utility script generation

Browse Source 
Use the new gen_util_scripts.py script to generate the glib-mkenums and
gdbus-codegen scripts with the proper info in them so that they can be
used properly by other build systems such as Meson, during "install".
This commit is contained in:
Chun-wei Fan
2017-05-24 15:43:59 +08:00
parent 79e73da2e5
commit e9846a7c8f
10 changed files with 121 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
win32/vs9/glib-gen-srcs.vsprops
View File

@@ -21,8 +21,4 @@
Name="GenGNetworkingH"
Value="copy ..\..\gio\gnetworking.h.win32 ..\..\gio\gnetworking.h"
/>
<UserMacro
Name="GenGLibMKEnums"
Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\gobject\glib-mkenums.in --output=..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)"
/>
</VisualStudioPropertySheet>

68
win32/vs9/glib-install.vcproj
View File

@@ -114,6 +114,74 @@
/>
</FileConfiguration>
</File>
<File RelativePath="..\..\gobject\glib-mkenums.in">
<FileConfiguration Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Generating glib-mkenums..."
CommandLine="$(GenGLibMKEnums)"
Outputs="..\..\gobject\glib-mkenums"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Generating glib-mkenums..."
CommandLine="$(GenGLibMKEnums)"
Outputs="..\..\gobject\glib-mkenums"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool
Name="VCCustomBuildTool"
Description="Generating glib-mkenums..."
CommandLine="$(GenGLibMKEnums)"
Outputs="..\..\gobject\glib-mkenums"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool
Name="VCCustomBuildTool"
Description="Generating glib-mkenums..."
CommandLine="$(GenGLibMKEnums)"
Outputs="..\..\gobject\glib-mkenums"
/>
</FileConfiguration>
</File>
<File RelativePath="..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in">
<FileConfiguration Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Generating gdbus-codegen..."
CommandLine="$(GenGDBusCodegen)"
Outputs="..\..\gio\gdbus-2.0\codegen\gdbus-codegen"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Generating gdbus-codegen..."
CommandLine="$(GenGDBusCodegen)"
Outputs="..\..\gio\gdbus-2.0\codegen\gdbus-codegen"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool
Name="VCCustomBuildTool"
Description="Generating gdbus-codegen..."
CommandLine="$(GenGDBusCodegen)"
Outputs="..\..\gio\gdbus-2.0\codegen\gdbus-codegen"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool
Name="VCCustomBuildTool"
Description="Generating gdbus-codegen..."
CommandLine="$(GenGDBusCodegen)"
Outputs="..\..\gio\gdbus-2.0\codegen\gdbus-codegen"
/>
</FileConfiguration>
</File>
</Filter>
</Files>
</VisualStudioProject>

10
win32/vs9/glib-install.vspropsin
View File

@@ -38,7 +38,7 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.exe $(CopyDir)
copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gdbus.pdb $(CopyDir)\bin&#x0D;&#x0A;
copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.exe $(CopyDir)\bin&#x0D;&#x0A;
copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\gio.pdb $(CopyDir)\bin&#x0D;&#x0A;
copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen&#x0D;&#x0A;
if exist ..\..\gio\gdbus-2.0\codegen\gdbus-codegen copy ..\..\gio\gdbus-2.0\codegen\gdbus-codegen $(CopyDir)\bin&#x0D;&#x0A;
if exist ..\..\gobject\glib-mkenums copy ..\..\gobject\glib-mkenums $(CopyDir)\bin&#x0D;&#x0A;
mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated&#x0D;&#x0A;
@@ -85,6 +85,14 @@ mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen&#x0D;&#x0A;
copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen&#x0D;&#x0A;
"
/>
<UserMacro
Name="GenGLibMKEnums"
Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-mkenums --version=$(GlibVersion)"
/>
<UserMacro
Name="GenGDBusCodegen"
Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen --version=$(GlibVersion)"
/>
<UserMacro
Name="GlibGenPC"
Value="(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; (if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))"

42
win32/vs9/gobject.vcprojin
View File

@@ -21,7 +21,7 @@
<Configurations>
<Configuration
Name="Debug|Win32"
InheritedPropertySheets=".\glib-gen-srcs.vsprops"
InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -51,7 +51,7 @@
</Configuration>
<Configuration
Name="Release|Win32"
InheritedPropertySheets=".\glib-gen-srcs.vsprops"
InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -81,7 +81,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
InheritedPropertySheets=".\glib-gen-srcs.vsprops"
InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -111,7 +111,7 @@
</Configuration>
<Configuration
Name="Release|x64"
InheritedPropertySheets=".\glib-gen-srcs.vsprops"
InheritedPropertySheets=".\glib-build-defines.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -161,40 +161,6 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File RelativePath="..\..\gobject\glib-mkenums.in">
<FileConfiguration Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Generating glib-mkenums..."
CommandLine="$(GenGLibMKEnums)"
Outputs="..\..\gobject\glib-mkenums"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
Description="Generating glib-mkenums..."
CommandLine="$(GenGLibMKEnums)"
Outputs="..\..\gobject\glib-mkenums"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool
Name="VCCustomBuildTool"
Description="Generating glib-mkenums..."
CommandLine="$(GenGLibMKEnums)"
Outputs="..\..\gobject\glib-mkenums"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool
Name="VCCustomBuildTool"
Description="Generating glib-mkenums..."
CommandLine="$(GenGLibMKEnums)"
Outputs="..\..\gobject\glib-mkenums"
/>
</FileConfiguration>
</File>
<File RelativePath="..\..\gobject\gobject.rc" />
</Filter>
</Files>