summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--win32/gipc.py59
-rw-r--r--win32/vs10/gi-install.propsin7
-rw-r--r--win32/vs9/gi-install.vcproj8
-rw-r--r--win32/vs9/gi-install.vspropsin5
4 files changed, 5 insertions, 74 deletions
diff --git a/win32/gipc.py b/win32/gipc.py
index 08b3982c..281f07f8 100644
--- a/win32/gipc.py
+++ b/win32/gipc.py
@@ -38,64 +38,5 @@ def main(argv):
base_pc.srcdir + '/gobject-introspection-no-export-1.0.pc',
pkg_replace_items)
- # Generate a generic .pc file for Cairo, that is just sufficient for our purposes
- cairo_version = '1.14.6' # Use the latest stable version, for now.
- cairo_pc = open(base_pc.srcdir + '/cairo.pc', 'w')
- cairo_pc.write('prefix=' + base_pc.prefix + '\n')
- cairo_pc.write('exec_prefix=${prefix}\n')
- cairo_pc.write('libdir=${prefix}/lib\n')
- cairo_pc.write('includedir=${prefix}/include\n\n')
- cairo_pc.write('Name: cairo\n')
- cairo_pc.write('Description: generic cairo pkg-config file\n')
- cairo_pc.write('Version: ' + cairo_version + '\n\n')
- cairo_pc.write('Requires.private:\n')
- cairo_pc.write('Libs: -L${libdir} -lcairo\n')
- cairo_pc.write('Libs.private:\n')
- cairo_pc.write('Cflags: -I${includedir}\n')
- cairo_pc.close()
-
- # Generate a generic .pc file for Cairo-Win32, that is just sufficient for our
- # purposes
- # Just make a copy of the cairo.pc we just generated and replace the items as needed
- cairo_win32_replace_items = \
- {'generic cairo pkg-config file': 'generic cairo-win32 pkg-config file'}
- replace_multi(base_pc.srcdir + '/cairo.pc',
- base_pc.srcdir + '/cairo-win32.pc',
- cairo_win32_replace_items)
-
- # Generate a generic .pc file for Cairo-GObject, that is just sufficient for our
- # purposes
- # Just make a copy of the cairo.pc we just generated and replace the items as needed
- cairo_gobject_replace_items = \
- {'Requires.private:': 'Requires.private: gobject-2.0,glib-2.0',
- 'generic cairo pkg-config file': 'generic cairo-gobject pkg-config file',
- '-lcairo': '-lcairo-gobject'}
- replace_multi(base_pc.srcdir + '/cairo.pc',
- base_pc.srcdir + '/cairo-gobject.pc',
- cairo_gobject_replace_items)
-
- # Generate a generic .pc file for libxml2, that is just sufficient for our purposes
- libxml2_version = '2.9.3' # Use the latest stable version, for now.
- libxml2_replace_items = \
- {'Name: cairo': 'Name: libXML',
- 'Version: ' + cairo_version: 'Version: ' + libxml2_version,
- 'generic cairo pkg-config file': 'generic libXML2 pkg-config file',
- '-lcairo': 'libxml2.lib',
- 'Cflags: -I${includedir}': 'Cflags: -I${includedir}/libxml2'}
- replace_multi(base_pc.srcdir + '/cairo.pc',
- base_pc.srcdir + '/libxml-2.0.pc',
- libxml2_replace_items)
-
- # Generate a generic .pc file for freetype2, that is just sufficient for our purposes
- ft2_version = '2.6.3' # Use the latest stable version, for now.
- ft2_replace_items = \
- {'Name: cairo': 'Name: FreeType 2',
- 'Version: ' + cairo_version: 'Version: ' + ft2_version,
- 'generic cairo pkg-config file': 'generic FreeType2 pkg-config file',
- '-lcairo': '-lfreetype'}
- replace_multi(base_pc.srcdir + '/cairo.pc',
- base_pc.srcdir + '/freetype2.pc',
- ft2_replace_items)
-
if __name__ == '__main__':
sys.exit(main(sys.argv))
diff --git a/win32/vs10/gi-install.propsin b/win32/vs10/gi-install.propsin
index 2304a44c..ab991ae5 100644
--- a/win32/vs10/gi-install.propsin
+++ b/win32/vs10/gi-install.propsin
@@ -87,13 +87,8 @@ copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
mkdir $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig
copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\cairo.pc $(CopyDir)\lib\pkgconfig
-copy ..\cairo-win32.pc $(CopyDir)\lib\pkgconfig
-copy ..\cairo-gobject.pc $(CopyDir)\lib\pkgconfig
-copy ..\libxml-2.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\freetype2.pc $(CopyDir)\lib\pkgconfig
</GIDoInstall>
- <GIPCFiles>..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc</GIPCFiles>
+ <GIPCFiles>..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc</GIPCFiles>
<GIGenPC>$(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPC>
<GIGenPCX64>$(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPCX64>
</PropertyGroup>
diff --git a/win32/vs9/gi-install.vcproj b/win32/vs9/gi-install.vcproj
index 5fd191c1..212bf54c 100644
--- a/win32/vs9/gi-install.vcproj
+++ b/win32/vs9/gi-install.vcproj
@@ -86,7 +86,7 @@
Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GIGenPC)"
- Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc"
+ Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc"
/>
</FileConfiguration>
<FileConfiguration Name="Release|Win32">
@@ -94,7 +94,7 @@
Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GIGenPC)"
- Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc"
+ Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc"
/>
</FileConfiguration>
<FileConfiguration Name="Debug|x64">
@@ -102,7 +102,7 @@
Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GIGenPCX64)"
- Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc"
+ Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc"
/>
</FileConfiguration>
<FileConfiguration Name="Release|x64">
@@ -110,7 +110,7 @@
Name="VCCustomBuildTool"
Description="Generating .pc files..."
CommandLine="$(GIGenPCX64)"
- Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc;..\cairo.pc;..\cairo-win32.pc;..\cairo-gobject.pc;..\libxml-2.0.pc;..\freetype2.pc"
+ Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc"
/>
</FileConfiguration>
</File>
diff --git a/win32/vs9/gi-install.vspropsin b/win32/vs9/gi-install.vspropsin
index b8e9df66..9ffa3386 100644
--- a/win32/vs9/gi-install.vspropsin
+++ b/win32/vs9/gi-install.vspropsin
@@ -89,11 +89,6 @@ copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
mkdir $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\cairo.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\cairo-win32.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\cairo-gobject.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\libxml-2.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\freetype2.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
"
/>
<UserMacro
View Lorry Controller Status