From 9f2c369bd8a1a966b2c75bdf07c3fbb1e01f5c69 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 3 Dec 2013 17:18:30 +0800 Subject: Split up the MSVC 2010 property sheets Split up the property sheets so that their maintenance can be simplified --- build/win32/vs10/Makefile.am | 15 ++++--- build/win32/vs10/gengir.vcxproj | 8 ++-- build/win32/vs10/install.vcxproj | 32 +++++++-------- build/win32/vs10/pango-build-defines.props | 42 +++++++++++++++++++ build/win32/vs10/pango-gengir.props | 31 ++++++++++++++ build/win32/vs10/pango-ignore-fc.props | 26 ++++++------ build/win32/vs10/pango-install-bin.props | 65 ++++++++++++++++++++++++++++++ build/win32/vs10/pango-install.propsin | 60 +++++++++++++++++++++++++++ build/win32/vs10/pango-prebuild.props | 53 ++++++++++++++++++++++++ build/win32/vs10/pango-version-paths.props | 53 ++++++++++++++++++++++++ build/win32/vs10/pango.vcxprojin | 12 ++++-- build/win32/vs10/pangocairo.vcxprojin | 16 ++++---- build/win32/vs10/pangoft2.vcxprojin | 8 ++-- build/win32/vs10/pangowin32.vcxproj | 8 ++-- 14 files changed, 371 insertions(+), 58 deletions(-) create mode 100644 build/win32/vs10/pango-build-defines.props create mode 100644 build/win32/vs10/pango-gengir.props create mode 100644 build/win32/vs10/pango-install-bin.props create mode 100644 build/win32/vs10/pango-install.propsin create mode 100644 build/win32/vs10/pango-prebuild.props create mode 100644 build/win32/vs10/pango-version-paths.props diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index 4626b4bd..cd174177 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -1,8 +1,13 @@ EXTRA_DIST = \ pango.sln \ - pango.propsin \ - pango.props \ + pango-build-defines.props \ + pango-gengir.props \ pango-ignore-fc.props \ + pango-install-bin.props \ + pango-install.props \ + pango-install.propsin \ + pango-prebuild.props \ + pango-version-paths.props \ pango.vcxproj \ pango.vcxproj.filters \ pango.vcxprojin \ @@ -21,10 +26,10 @@ EXTRA_DIST = \ gengir.vcxproj \ README.txt -pango.props: $(top_srcdir)/build/win32/vs10/pango.propsin pango.vs10.headers - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pango.propsin >$@ +pango-install.props: $(top_srcdir)/build/win32/vs10/pango-install.propsin pango.vs10.headers + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/pango-install.propsin >$@ rm pango.vs10.headers -DISTCLEANFILES = pango.props +DISTCLEANFILES = pango-install.props -include $(top_srcdir)/git.mk diff --git a/build/win32/vs10/gengir.vcxproj b/build/win32/vs10/gengir.vcxproj index 3c6859db..31305728 100644 --- a/build/win32/vs10/gengir.vcxproj +++ b/build/win32/vs10/gengir.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj index 4e8fc047..b8bab145 100644 --- a/build/win32/vs10/install.vcxproj +++ b/build/win32/vs10/install.vcxproj @@ -89,35 +89,35 @@ - + - + - + - + - + - + - + - + @@ -140,42 +140,42 @@ - $(PangoInstallFC) $(PangoDoInstall) + $(PangoDoInstallBin) $(PangoInstallHeadersData) - $(PangoInstallNoFC) $(PangoDoInstall) + $(PangoDoInstallBin) $(PangoInstallHeadersData) - $(PangoInstallFC) $(PangoDoInstall) + $(PangoDoInstallBin) $(PangoInstallHeadersData) - $(PangoInstallNoFC) $(PangoDoInstall) + $(PangoDoInstallBin) $(PangoInstallHeadersData) - $(PangoInstallFC) $(PangoDoInstall) + $(PangoDoInstallBin) $(PangoInstallHeadersData) - $(PangoInstallNoFC) $(PangoDoInstall) + $(PangoDoInstallBin) $(PangoInstallHeadersData) - $(PangoInstallFC) $(PangoDoInstall) + $(PangoDoInstallBin) $(PangoInstallHeadersData) - $(PangoInstallNoFC) $(PangoDoInstall) + $(PangoDoInstallBin) $(PangoInstallHeadersData) diff --git a/build/win32/vs10/pango-build-defines.props b/build/win32/vs10/pango-build-defines.props new file mode 100644 index 00000000..b5b6d1f0 --- /dev/null +++ b/build/win32/vs10/pango-build-defines.props @@ -0,0 +1,42 @@ + + + + + + + 1.8.0 + /dummy + G_LOG_DOMAIN="Pango";PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE;SYSCONFDIR="$(PangoDummyPrefix)/etc";LIBDIR="$(PangoDummyPrefix)/lib" + PANGO_VISUALC_NO_FC + + + <_PropertySheetDisplayName>pangobuilddefinesprops + $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + + ..\..\..;..\..\..\pango;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\fontconfig;$(GlibEtcInstallRoot)\include\freetype2;%(AdditionalIncludeDirectories) + HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + + + gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;%(AdditionalDependencies) + $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + + + + + $(PangoBinaryVersion) + + + $(PangoDummyPrefix) + + + $(PangoDefines) + + + $(NoFCDef) + + + \ No newline at end of file diff --git a/build/win32/vs10/pango-gengir.props b/build/win32/vs10/pango-gengir.props new file mode 100644 index 00000000..2050e98c --- /dev/null +++ b/build/win32/vs10/pango-gengir.props @@ -0,0 +1,31 @@ + + + + + + + +set VSVER=$(VSVer) + +set CONF=$(Configuration) + +set PLAT=$(Platform) + +set BASEDIR=$(GlibEtcInstallRoot) + +cd .. + +call gengir_pango.bat + +cd vs$(VSVer) + + + + <_PropertySheetDisplayName>pangogengirprops + + + + $(DoGenGir) + + + \ No newline at end of file diff --git a/build/win32/vs10/pango-ignore-fc.props b/build/win32/vs10/pango-ignore-fc.props index 53dc958a..adeb3635 100644 --- a/build/win32/vs10/pango-ignore-fc.props +++ b/build/win32/vs10/pango-ignore-fc.props @@ -1,14 +1,14 @@ - - - - <_PropertySheetDisplayName>pangoignorefcprops - - - - false - - - $(OutDir)\pangowin32-1.0.lib;$(OutDir)\pango-1.0.lib;%(AdditionalDependencies) - - + + + + <_PropertySheetDisplayName>pangoignorefcprops + + + + false + + + $(OutDir)\pangowin32-1.0.lib;$(OutDir)\pango-1.0.lib;%(AdditionalDependencies) + + \ No newline at end of file diff --git a/build/win32/vs10/pango-install-bin.props b/build/win32/vs10/pango-install-bin.props new file mode 100644 index 00000000..8a8ca733 --- /dev/null +++ b/build/win32/vs10/pango-install-bin.props @@ -0,0 +1,65 @@ + + + + + + + +mkdir $(CopyDir)\bin + +mkdir $(CopyDir)\lib + + +if "$(Configuration)" == "Release_FC" goto DO_FC_BIN + +if "$(Configuration)" == "Debug_FC" goto DO_FC_BIN + + +copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin + +copy $(Configuration)\$(Platform)\bin\*-$(PangoApiVersion).lib $(CopyDir)\lib + +goto DONE_BIN + + +:DO_FC_BIN + +copy $(Configuration)\$(Platform)\bin\$(PangoDllPrefix)pangoft2$(PangoDllSuffix).dll $(CopyDir)\bin + +copy $(Configuration)\$(Platform)\bin\$(PangoDllPrefix)pangocairo$(PangoDllSuffix).dll $(CopyDir)\bin + +copy $(Configuration)\$(Platform)\bin\pangoft2-$(PangoApiVersion).lib $(CopyDir)\lib + +copy $(Configuration)\$(Platform)\bin\pangocairo-$(PangoApiVersion).lib $(CopyDir)\lib + + +if "$(Configuration)" == "Release_FC" copy $(SolutionDir)\Release\$(Platform)\bin\$(PangoDllPrefix)pango$(PangoDllSuffix).dll $(CopyDir)\bin + +if "$(Configuration)" == "Release_FC" copy $(SolutionDir)\Release\$(Platform)\bin\$(PangoDllPrefix)pangowin32$(PangoDllSuffix).dll $(CopyDir)\bin + +if "$(Configuration)" == "Release_FC" copy $(SolutionDir)\Release\$(Platform)\bin\pango-$(PangoApiVersion).lib $(CopyDir)\lib + +if "$(Configuration)" == "Release_FC" copy $(SolutionDir)\Release\$(Platform)\bin\pangowin32-$(PangoApiVersion).lib $(CopyDir)\lib + + +if "$(Configuration)" == "Debug_FC" copy $(SolutionDir)\Debug\$(Platform)\bin\$(PangoDllPrefix)pango$(PangoDllSuffix).dll $(CopyDir)\bin + +if "$(Configuration)" == "Debug_FC" copy $(SolutionDir)\Debug\$(Platform)\bin\$(PangoDllPrefix)pangowin32$(PangoDllSuffix).dll $(CopyDir)\bin + +if "$(Configuration)" == "Debug_FC" copy $(SolutionDir)\Debug\$(Platform)\bin\pango-$(PangoApiVersion).lib $(CopyDir)\lib + +if "$(Configuration)" == "Debug_FC" copy $(SolutionDir)\Debug\$(Platform)\bin\pangowin32-$(PangoApiVersion).lib $(CopyDir)\lib + +:DONE_BIN + + + + + <_PropertySheetDisplayName>pangoinstallbinprops + + + + $(PangoDoInstallBin) + + + \ No newline at end of file diff --git a/build/win32/vs10/pango-install.propsin b/build/win32/vs10/pango-install.propsin new file mode 100644 index 00000000..a7010cdd --- /dev/null +++ b/build/win32/vs10/pango-install.propsin @@ -0,0 +1,60 @@ + + + + + + + +#include "pango.vs10.headers" + +copy ..\..\..\pango\pango-features.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + +copy ..\..\..\pango\pango-enum-types.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + +copy ..\..\..\pango\pangowin32.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + + +if "$(Configuration)" == "Release" goto DO_CREATE_PANGO_ALIASES + +if "$(Configuration)" == "Debug" goto DO_CREATE_PANGO_ALIASES + + +if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango + +copy ..\..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + +copy ..\..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + +copy ..\..\..\pango\pangofc-fontmap.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + +copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + +copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango + + +:DO_CREATE_PANGO_ALIASES + +if exist $(CopyDir)\etc\pango\pango.aliases goto END + +echo tahoma = "tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" > $(CopyDir)\etc\pango\pango.aliases + +echo sans = "arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" >> $(CopyDir)\etc\pango\pango.aliases + +echo serif = "times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,latha,mangal" >> $(CopyDir)\etc\pango\pango.aliases + +echo monospace = "courier new,courier monothai,mingliu,simsun,gulimche,ms gothic,latha,mangal" >> $(CopyDir)\etc\pango\pango.aliases + +:END + + + + <_PropertySheetDisplayName>pangoinstallprops + + + + + + $(PangoInstallHeadersData) + + + \ No newline at end of file diff --git a/build/win32/vs10/pango-prebuild.props b/build/win32/vs10/pango-prebuild.props new file mode 100644 index 00000000..6a20a311 --- /dev/null +++ b/build/win32/vs10/pango-prebuild.props @@ -0,0 +1,53 @@ + + + + <_PropertySheetDisplayName>pangoprebuildprops + + + + +if exist ..\..\..\config.h goto DONE_CONFIG_H + +copy ..\..\..\config.h.win32 ..\..\..\config.h + +:DONE_CONFIG_H + + +if exist ..\..\..\pango\DONE_MODULE_DEFS_H goto DONE_MODULE_DEFS_H + +copy /y ..\..\..\pango\module-defs.h.win32 ..\..\..\pango\module-defs.h + +copy ..\..\..\pango\module-defs.h.win32 ..\..\..\pango\DONE_MODULE_DEFS_H + +:DONE_MODULE_DEFS_H + + +if exist ..\..\..\pango\DONE_MODULE_DEFS_LANG_C goto DONE_MODULE_DEFS_LANG_C + +copy ..\..\..\pango\module-defs-lang.c.win32 ..\..\..\pango\module-defs-lang.c + +copy ..\..\..\pango\module-defs-lang.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_LANG_C + +:DONE_MODULE_DEFS_LANG_C + + +if exist ..\..\..\pango\DONE_MODULE_DEFS_FC_C goto DONE_MODULE_DEFS_FC_C + +copy ..\..\..\pango\module-defs-fc.c.win32 ..\..\..\pango\module-defs-fc.c + +copy ..\..\..\pango\module-defs-fc.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_FC_C + +:DONE_MODULE_DEFS_FC_C + + +if exist ..\..\..\pango\DONE_MODULE_DEFS_WIN32_C goto DONE_MODULE_DEFS_WIN32_C + +copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\module-defs-win32.c + +copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_WIN32_C + +:DONE_MODULE_DEFS_WIN32_C + + + + \ No newline at end of file diff --git a/build/win32/vs10/pango-version-paths.props b/build/win32/vs10/pango-version-paths.props new file mode 100644 index 00000000..8027f816 --- /dev/null +++ b/build/win32/vs10/pango-version-paths.props @@ -0,0 +1,53 @@ + + + + 10 + $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) + $(GlibEtcInstallRoot) + 1.0 + lib + -$(PangoApiVersion)-0 + + -1-vs$(VSVer) + $(PangoSeparateVSDllPrefix) + $(PangoSeparateVSDllSuffix) + + + <_PropertySheetDisplayName>pangoversionpathsprops + + + + $(VSVer) + + + $(GlibEtcInstallRoot) + + + $(GlibEtcInstallRootFromBuildWin32) + + + $(CopyDir) + + + $(PangoApiVersion) + + + $(PangoLibtoolCompatibleDllPrefix) + + + $(PangoLibtoolCompatibleDllSuffix) + + + $(PangoSeparateVSDllPrefix) + + + $(PangoSeparateVSDllSuffix) + + + $(PangoDllPrefix) + + + $(PangoDllSuffix) + + + \ No newline at end of file diff --git a/build/win32/vs10/pango.vcxprojin b/build/win32/vs10/pango.vcxprojin index 1b2b668b..e82a7ee4 100644 --- a/build/win32/vs10/pango.vcxprojin +++ b/build/win32/vs10/pango.vcxprojin @@ -51,19 +51,23 @@ - + + - + + - + + - + + diff --git a/build/win32/vs10/pangocairo.vcxprojin b/build/win32/vs10/pangocairo.vcxprojin index e1bcd902..8f908adb 100644 --- a/build/win32/vs10/pangocairo.vcxprojin +++ b/build/win32/vs10/pangocairo.vcxprojin @@ -89,39 +89,39 @@ - + - + - + - + - + - + - + - + diff --git a/build/win32/vs10/pangoft2.vcxprojin b/build/win32/vs10/pangoft2.vcxprojin index c21f7dd5..d5eb457c 100644 --- a/build/win32/vs10/pangoft2.vcxprojin +++ b/build/win32/vs10/pangoft2.vcxprojin @@ -51,19 +51,19 @@ - + - + - + - + diff --git a/build/win32/vs10/pangowin32.vcxproj b/build/win32/vs10/pangowin32.vcxproj index 5d981d58..cc4ab779 100644 --- a/build/win32/vs10/pangowin32.vcxproj +++ b/build/win32/vs10/pangowin32.vcxproj @@ -67,19 +67,19 @@ - + - + - + - + -- cgit v1.2.1