From: Chun-wei Fan Date: Thu, 12 Dec 2013 07:53:07 +0000 (+0800) Subject: Visual C++ Projects: Split the Property Sheets X-Git-Tag: ATK_2_11_4~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc368e105bf9aa81d7fc80b5c4e3bb2924ad98fe;p=platform%2Fupstream%2Fatk.git Visual C++ Projects: Split the Property Sheets This will make the single property sheets split into multiple property sheets as: -They will be easier to maintain -Individual Projects can include them as needed -Easier to automate the listing of headers to "install" Also update some parts to improve the overall build experience, specifically combining macro defs and using a custom build rule for config.h. --- diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index ef3f2b4..7623024 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -1,10 +1,14 @@ -EXTRA_DIST = \ - README.txt \ - atk.sln \ - atk.props \ - atk.vcxproj \ - atk.vcxprojin \ - atk.vcxproj.filters \ - atk.vcxproj.filtersin \ +EXTRA_DIST = \ + README.txt \ + atk.sln \ + atk.vcxproj \ + atk.vcxprojin \ + atk.vcxproj.filters \ + atk.vcxproj.filtersin \ install.vcxproj \ - gengir.vcxproj + gengir.vcxproj \ + atk-build-defines.props \ + atk-gen-src.props \ + atk-gengir.props \ + atk-install.props \ + atk-version-paths.props diff --git a/build/win32/vs10/atk-build-defines.props b/build/win32/vs10/atk-build-defines.props new file mode 100644 index 0000000..a0bec90 --- /dev/null +++ b/build/win32/vs10/atk-build-defines.props @@ -0,0 +1,30 @@ + + + + + + + ATK_COMPILATION;DLL_EXPORT;ATK_LOCALEDIR="/dummy/share/locale" + + + <_PropertySheetDisplayName>atkbuilddefinesprops + $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + + ..\..\..;..\..\..\atk;$(GLibEtcInstallRoot)\include;$(GLibEtcInstallRoot)\include\glib-2.0;$(GLibEtcInstallRoot)\lib\glib-2.0\include\;%(AdditionalIncludeDirectories) + HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + + + glib-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;intl.lib;%(AdditionalDependencies) + $(GLibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + + + + + $(AtkDefines) + + + diff --git a/build/win32/vs10/atk-gen-src.props b/build/win32/vs10/atk-gen-src.props new file mode 100644 index 0000000..60783a8 --- /dev/null +++ b/build/win32/vs10/atk-gen-src.props @@ -0,0 +1,43 @@ + + + + + + + +if exist ..\..\..\config.h goto DONE_CONFIG_H + +copy ..\..\..\config.h.win32 ..\..\..\config.h + +:DONE_CONFIG_H + + +cd ..\..\..\atk + +$(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --header > atkmarshal.h + +$(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --body > atkmarshal.c + +cd $(SolutionDir) + + +echo EXPORTS > $(DefDir)\atk.def + +cl /EP ..\..\..\atk\atk.symbols >> $(DefDir)\atk.def + + + + <_PropertySheetDisplayName>atkgensrcprops + + + + $(GenConfigH) + + + $(GenMarshalSrc) + + + $(GenerateAtkDef) + + + diff --git a/build/win32/vs10/atk-gengir.props b/build/win32/vs10/atk-gengir.props new file mode 100644 index 0000000..34708f0 --- /dev/null +++ b/build/win32/vs10/atk-gengir.props @@ -0,0 +1,26 @@ + + + + + + + +set VSVER=$(VSVer) +set CONF=$(Configuration) +set PLAT=$(Platform) +set BASEDIR=$(GlibEtcInstallRoot) +cd .. +call gengir.bat + +cd vs$(VSVer) + + + + <_PropertySheetDisplayName>atkgengirprops + + + + $(DoGenGir) + + + diff --git a/build/win32/vs10/atk-install.props b/build/win32/vs10/atk-install.props new file mode 100644 index 0000000..0a9907d --- /dev/null +++ b/build/win32/vs10/atk-install.props @@ -0,0 +1,90 @@ + + + + + + + +mkdir $(CopyDir)\bin + +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin + + +mkdir $(CopyDir)\lib + +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib + + +mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atk.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkaction.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkcomponent.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkdocument.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkeditabletext.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkgobjectaccessible.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkhyperlink.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkhyperlinkimpl.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkhypertext.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atknoopobject.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atknoopobjectfactory.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkobject.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkobjectfactory.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkplug.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkimage.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkregistry.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkrelation.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkrelationtype.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkrelationset.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkselection.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atksocket.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkstate.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkstateset.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkstreamablecontent.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atktable.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atktext.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkutil.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkmisc.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkvalue.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkwindow.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atkversion.h $(CopyDir)\include\atk-$(ApiVersion)\atk + +copy ..\..\..\atk\atk-enum-types.h $(CopyDir)\include\atk-$(ApiVersion)\atk + + + + + $(AtkDoInstall) + + + diff --git a/build/win32/vs10/atk-version-paths.props b/build/win32/vs10/atk-version-paths.props new file mode 100644 index 0000000..4298972 --- /dev/null +++ b/build/win32/vs10/atk-version-paths.props @@ -0,0 +1,51 @@ + + + + 1.0 + 10 + $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) + $(GLibEtcInstallRoot) + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + lib + -$(ApiVersion)-0 + + -1-vs$(VSVer) + $(AtkSeparateVSDllPrefix) + $(AtkSeparateVSDllSuffix) + + + <_PropertySheetDisplayName>atkversionpathsprops + + + + $(ApiVersion) + + + $(GLibEtcInstallRoot) + + + $(CopyDir) + + + $(DefDir) + + + $(AtkLibtoolCompatibleDllPrefix) + + + $(AtkLibtoolCompatibleDllSuffix) + + + $(AtkSeparateVSDllPrefix) + + + $(AtkSeparateVSDllSuffix) + + + $(AtkDllPrefix) + + + $(AtkDllSuffix) + + + diff --git a/build/win32/vs10/atk.props b/build/win32/vs10/atk.props deleted file mode 100644 index 09f42bb..0000000 --- a/build/win32/vs10/atk.props +++ /dev/null @@ -1,196 +0,0 @@ - - - - 1.0 - \"/dummy\" - 10 - $(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform) - $(GLibEtcInstallRoot) - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - -mkdir $(CopyDir)\bin - -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin - - -mkdir $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atk.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkaction.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkcomponent.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkdocument.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkeditabletext.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkgobjectaccessible.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkhyperlink.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkhyperlinkimpl.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkhypertext.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atknoopobject.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atknoopobjectfactory.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkobject.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkobjectfactory.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkplug.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkimage.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkregistry.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkrelation.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkrelationtype.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkrelationset.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkselection.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atksocket.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkstate.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkstateset.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkstreamablecontent.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atktable.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atktext.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkutil.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkmisc.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkvalue.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkwindow.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atkversion.h $(CopyDir)\include\atk-$(ApiVersion)\atk - -copy ..\..\..\atk\atk-enum-types.h $(CopyDir)\include\atk-$(ApiVersion)\atk - - -mkdir $(CopyDir)\lib - -copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib - - - -set VSVER=$(VSVer) -set CONF=$(Configuration) -set PLAT=$(Platform) -set BASEDIR=$(GlibEtcInstallRoot) -cd .. -call gengir.bat - -cd vs$(VSVer) - - -if exist ..\..\..\atk\atkmarshal.h goto DONE_GEN_MARS_H -cd ..\..\..\atk -$(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --header > atkmarshal.h -cd $(SolutionDir) - -:DONE_GEN_MARS_H -if exist ..\..\..\atk\atkmarshal.c goto DONE_GEN_MARS_C -cd ..\..\..\atk -$(GLibEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal atkmarshal.list --body > atkmarshal.c -cd $(SolutionDir) - -:DONE_GEN_MARS_C - - -echo EXPORTS > $(DefDir)\atk.def -cl /EP ..\..\..\atk\atk.symbols >> $(DefDir)\atk.def - - ATK_COMPILATION;DLL_EXPORT;ATK_LOCALEDIR="$(AtkDummyPrefix)/share/locale" - lib - -1.0-0 - - -1-vs$(VSVer) - $(AtkSeparateVSDllPrefix) - $(AtkSeparateVSDllSuffix) - - - <_PropertySheetDisplayName>atkprops - $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ - $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ - - - - ..\..\..;..\..\..\atk;$(GLibEtcInstallRoot)\include;$(GLibEtcInstallRoot)\include\glib-2.0;$(GLibEtcInstallRoot)\lib\glib-2.0\include\;%(AdditionalIncludeDirectories) - HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions) - msvc_recommended_pragmas.h;%(ForcedIncludeFiles) - - - glib-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;intl.lib;%(AdditionalDependencies) - $(GLibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) - - - -if exist ..\..\..\config.h goto DONE_CONFIG_H - -copy ..\..\..\config.h.win32 ..\..\..\config.h - -:DONE_CONFIG_H - - - - - - $(ApiVersion) - - - $(AtkDummyPrefix) - - - $(GLibEtcInstallRoot) - - - $(CopyDir) - - - $(DefDir) - - - $(AtkDoInstall) - - - $(GenMarshalSrc) - - - $(GenerateAtkDef) - - - $(AtkDefines) - - - $(AtkLibtoolCompatibleDllPrefix) - - - $(AtkLibtoolCompatibleDllSuffix) - - - $(AtkSeparateVSDllPrefix) - - - $(AtkSeparateVSDllSuffix) - - - $(AtkDllPrefix) - - - $(AtkDllSuffix) - - - diff --git a/build/win32/vs10/atk.vcxproj.filtersin b/build/win32/vs10/atk.vcxproj.filtersin index 07395b7..13bd339 100644 --- a/build/win32/vs10/atk.vcxproj.filtersin +++ b/build/win32/vs10/atk.vcxproj.filtersin @@ -18,6 +18,7 @@ #include "libatk.vs10.sourcefiles.filters" + Resource Files Resource Files Resource Files diff --git a/build/win32/vs10/atk.vcxprojin b/build/win32/vs10/atk.vcxprojin index a52baf7..b2fc326 100644 --- a/build/win32/vs10/atk.vcxprojin +++ b/build/win32/vs10/atk.vcxprojin @@ -50,19 +50,19 @@ - + - + - + - + @@ -164,6 +164,20 @@ #include "libatk.vs10.sourcefiles" + + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Generating Marshalling Sources... $(GenMarshalSrc) diff --git a/build/win32/vs10/gengir.vcxproj b/build/win32/vs10/gengir.vcxproj index 1071b19..8cdd305 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 1a4b34d..f2b4c39 100644 --- a/build/win32/vs10/install.vcxproj +++ b/build/win32/vs10/install.vcxproj @@ -50,19 +50,19 @@ - + - + - + - + diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index b707f2c..29520a8 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -1,8 +1,12 @@ -EXTRA_DIST = \ - README.txt \ - atk.sln \ - atk.vsprops \ - atk.vcproj \ - atk.vcprojin \ +EXTRA_DIST = \ + README.txt \ + atk.sln \ + atk.vcproj \ + atk.vcprojin \ install.vcproj \ - gengir.vcproj + gengir.vcproj \ + atk-build-defines.vsprops \ + atk-gen-src.vsprops \ + atk-gengir.vsprops \ + atk-install.vsprops \ + atk-version-paths.vsprops diff --git a/build/win32/vs9/atk-build-defines.vsprops b/build/win32/vs9/atk-build-defines.vsprops new file mode 100644 index 0000000..351d19e --- /dev/null +++ b/build/win32/vs9/atk-build-defines.vsprops @@ -0,0 +1,25 @@ + + + + + + diff --git a/build/win32/vs9/atk-gen-src.vsprops b/build/win32/vs9/atk-gen-src.vsprops new file mode 100644 index 0000000..d3fc31f --- /dev/null +++ b/build/win32/vs9/atk-gen-src.vsprops @@ -0,0 +1,32 @@ + + + + + + diff --git a/build/win32/vs9/atk-gengir.vsprops b/build/win32/vs9/atk-gengir.vsprops new file mode 100644 index 0000000..bd61147 --- /dev/null +++ b/build/win32/vs9/atk-gengir.vsprops @@ -0,0 +1,21 @@ + + + + diff --git a/build/win32/vs9/atk.vsprops b/build/win32/vs9/atk-install.vsprops similarity index 52% rename from build/win32/vs9/atk.vsprops rename to build/win32/vs9/atk-install.vsprops index 61273f9..e0d7db9 100644 --- a/build/win32/vs9/atk.vsprops +++ b/build/win32/vs9/atk-install.vsprops @@ -2,49 +2,9 @@ - - - - - - - - - - - - - - - - - - - diff --git a/build/win32/vs9/atk-version-paths.vsprops b/build/win32/vs9/atk-version-paths.vsprops new file mode 100644 index 0000000..af7d75c --- /dev/null +++ b/build/win32/vs9/atk-version-paths.vsprops @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + diff --git a/build/win32/vs9/atk.vcprojin b/build/win32/vs9/atk.vcprojin index 8a9fbc5..6dcd55d 100644 --- a/build/win32/vs9/atk.vcprojin +++ b/build/win32/vs9/atk.vcprojin @@ -22,7 +22,7 @@ @@ -88,7 +88,7 @@ @@ -120,7 +120,7 @@ @@ -171,6 +171,40 @@ 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}" > + + + + + + + + + + + + + + @@ -61,7 +61,7 @@