r20076 by jghali - integrate ms publisher and pagemaker import plugins to msvc solutions

scribus-commit scribus-commit at lists.scribus.net
Tue May 12 16:32:18 UTC 2015 

Author: jghali
Date: Tue May 12 16:32:18 2015
New Revision: 20076

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20076
Log:
integrate ms publisher and pagemaker import plugins to msvc solutions

Modified:
    trunk/Scribus/BUILDING_win32_msvc.txt
    trunk/Scribus/win32/vc10/Scribus-build-props.props
    trunk/Scribus/win32/vc10/Scribus.sln
    trunk/Scribus/win32/vc10/win-config.h
    trunk/Scribus/win32/vc11/Scribus-build-props.props
    trunk/Scribus/win32/vc11/Scribus.sln
    trunk/Scribus/win32/vc11/win-config.h

Modified: trunk/Scribus/BUILDING_win32_msvc.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20076&path=/trunk/Scribus/BUILDING_win32_msvc.txt
==============================================================================
--- trunk/Scribus/BUILDING_win32_msvc.txt (original)
+++ trunk/Scribus/BUILDING_win32_msvc.txt Tue May 12 16:32:18 2015
@@ -70,8 +70,8 @@
 	- XXXXXX is a series of numbers representing a date.
 
 For building 15x dependencies,  an archive for Visual Studio 2012 is provided. The Visual Studio 2012 archive allows to build 
-libraries for 32bit and 64bit platforms using the different available toolsets. The default configuration, corresponding to the
-msvc 2012 default toolset (v110), allows to build binaries compatible with Windows Vista and up.
+libraries for 32bit and 64bit platforms using the different available toolsets, excluding the v110_xp and v120_xp ones. The default 
+configuration, corresponding to the msvc 2012 default toolset (v110), allows to build binaries compatible with Windows Vista and up.
 
 Once you downloaded the two appropriate archives :
 	- decompress them in the *same* directory.
@@ -127,8 +127,8 @@
 copy  %SCRIBUS_SRC_PATH%\scribus\plugins\barcodegenerator\barcode.ps %SCRIBUS_INSTALL_PATH%\share\plugins\barcode.ps
 xcopy %SCRIBUS_SRC_PATH%\scribus\ui\qml %SCRIBUS_INSTALL_PATH%\share\qml /s /y
 copy  %SCRIBUS_SRC_PATH%\scribus\unicodemap\unicodenameslist.txt %SCRIBUS_INSTALL_PATH%\share\unicodenameslist.txt
-del  %SCRIBUS_BUILD_ROOT%\*CMake* /s
-del  %SCRIBUS_BUILD_ROOT%\*MakeFile* /s
+del   %SCRIBUS_BUILD_ROOT%\*CMake* /s
+del   %SCRIBUS_BUILD_ROOT%\*MakeFile* /s
 
 Adjust SCRIBUS_SRC_PATH, SCRIBUS_BUILD_ROOT and SCRIBUS_INSTALL_PATH as needed and run batch script.
 

Modified: trunk/Scribus/win32/vc10/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20076&path=/trunk/Scribus/win32/vc10/Scribus-build-props.props
==============================================================================
--- trunk/Scribus/win32/vc10/Scribus-build-props.props (original)
+++ trunk/Scribus/win32/vc10/Scribus-build-props.props Tue May 12 16:32:18 2015
@@ -52,8 +52,12 @@
     <ICONV_DIR>$(SCRIBUS_LIB_ROOT)\libiconv-1.14</ICONV_DIR>
 	<ICONV_INCLUDE_DIR>$(ICONV_DIR)\include</ICONV_INCLUDE_DIR>
 	<ICONV_LIB_DIR>$(ICONV_DIR)\lib</ICONV_LIB_DIR>
-	<ICONV_LIB Condition="'$(Configuration)' == 'Debug'">iconv.lib</ICONV_LIB>
-    <ICONV_LIB Condition="'$(Configuration)' == 'Release'">iconv_d.lib</ICONV_LIB>
+	<ICONV_LIB Condition="'$(Configuration)' == 'Debug'">iconv_d.lib</ICONV_LIB>
+    <ICONV_LIB Condition="'$(Configuration)' == 'Release'">iconv.lib</ICONV_LIB>
+	<!-- Icu -->
+	<ICU_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\icu-52.1\include</ICU_INCLUDE_DIR>
+	<ICU_LIB_DIR>$(SCRIBUS_LIB_ROOT)\icu-52.1\lib</ICU_LIB_DIR>
+	<ICU_LIB>icudt.lib;icuin.lib;icuuc.lib</ICU_LIB>
 	<!-- Littlecms -->
     <LCMS_DIR>$(SCRIBUS_LIB_ROOT)\lcms2-2.7</LCMS_DIR>
 	<LCMS_INCLUDE_DIR>$(LCMS_DIR)\include</LCMS_INCLUDE_DIR>
@@ -66,6 +70,11 @@
 	<LIBJPEG_LIB_DIR>$(LIBJPEG_DIR)\lib</LIBJPEG_LIB_DIR>
     <LIBJPEG_LIB Condition="'$(Configuration)' == 'Debug'">libjpeg9a_d.lib</LIBJPEG_LIB>
     <LIBJPEG_LIB Condition="'$(Configuration)' == 'Release'">libjpeg9a.lib</LIBJPEG_LIB>
+	<!-- Libmspub -->
+	<LIBMSPUB_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\libmspub-0.1.2\inc</LIBMSPUB_INCLUDE_DIR>
+	<LIBMSPUB_LIB_DIR>$(SCRIBUS_LIB_ROOT)\libmspub-0.1.2\lib</LIBMSPUB_LIB_DIR>
+    <LIBMSPUB_LIB Condition="'$(Configuration)' == 'Debug'">libmspub_d.lib</LIBMSPUB_LIB>
+    <LIBMSPUB_LIB Condition="'$(Configuration)' == 'Release'">libmspub.lib</LIBMSPUB_LIB>
 	<!-- Libpagemaker -->
 	<LIBPAGEMAKER_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\libpagemaker-0.0.2\inc</LIBPAGEMAKER_INCLUDE_DIR>
 	<LIBPAGEMAKER_LIB_DIR>$(SCRIBUS_LIB_ROOT)\libpagemaker-0.0.2\lib</LIBPAGEMAKER_LIB_DIR>

Modified: trunk/Scribus/win32/vc10/Scribus.sln
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20076&path=/trunk/Scribus/win32/vc10/Scribus.sln
==============================================================================
--- trunk/Scribus/win32/vc10/Scribus.sln (original)
+++ trunk/Scribus/win32/vc10/Scribus.sln Tue May 12 16:32:18 2015
@@ -303,6 +303,16 @@
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shapeplugin", "shapeplugin\shapeplugin.vcxproj", "{08A3346A-8DA3-4C32-AC44-20623EF46A71}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pagemakerimport", "pagemakerimport\pagemakerimport.vcxproj", "{DFABF9F6-3A94-441C-8E90-7C155278800E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pubimport", "pubimport\pubimport.vcxproj", "{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
 	EndProjectSection
@@ -561,6 +571,14 @@
 		{08A3346A-8DA3-4C32-AC44-20623EF46A71}.Debug|Win32.Build.0 = Debug|Win32
 		{08A3346A-8DA3-4C32-AC44-20623EF46A71}.Release|Win32.ActiveCfg = Release|Win32
 		{08A3346A-8DA3-4C32-AC44-20623EF46A71}.Release|Win32.Build.0 = Release|Win32
+		{DFABF9F6-3A94-441C-8E90-7C155278800E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DFABF9F6-3A94-441C-8E90-7C155278800E}.Debug|Win32.Build.0 = Debug|Win32
+		{DFABF9F6-3A94-441C-8E90-7C155278800E}.Release|Win32.ActiveCfg = Release|Win32
+		{DFABF9F6-3A94-441C-8E90-7C155278800E}.Release|Win32.Build.0 = Release|Win32
+		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Debug|Win32.Build.0 = Debug|Win32
+		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Release|Win32.ActiveCfg = Release|Win32
+		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/Scribus/win32/vc10/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20076&path=/trunk/Scribus/win32/vc10/win-config.h
==============================================================================
--- trunk/Scribus/win32/vc10/win-config.h (original)
+++ trunk/Scribus/win32/vc10/win-config.h Tue May 12 16:32:18 2015
@@ -55,6 +55,9 @@
 /* Define if you have the development files for python */
 #define HAVE_PYTHON 1
 
+/* Define if you have the development files for librevenge */
+#define HAVE_REVENGE 1
+
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 #ifdef _MSC_VER

Modified: trunk/Scribus/win32/vc11/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20076&path=/trunk/Scribus/win32/vc11/Scribus-build-props.props
==============================================================================
--- trunk/Scribus/win32/vc11/Scribus-build-props.props (original)
+++ trunk/Scribus/win32/vc11/Scribus-build-props.props Tue May 12 16:32:18 2015
@@ -55,8 +55,12 @@
     <ICONV_DIR>$(SCRIBUS_LIB_ROOT)\libiconv-1.14</ICONV_DIR>
 	<ICONV_INCLUDE_DIR>$(ICONV_DIR)\include</ICONV_INCLUDE_DIR>
 	<ICONV_LIB_DIR>$(ICONV_DIR)\lib\$(Platform)-$(PlatformToolset)</ICONV_LIB_DIR>
-	<ICONV_LIB Condition="'$(Configuration)' == 'Debug'">iconv.lib</ICONV_LIB>
-    <ICONV_LIB Condition="'$(Configuration)' == 'Release'">iconv_d.lib</ICONV_LIB>
+	<ICONV_LIB Condition="'$(Configuration)' == 'Debug'">iconv_d.lib</ICONV_LIB>
+    <ICONV_LIB Condition="'$(Configuration)' == 'Release'">iconv.lib</ICONV_LIB>
+	<!-- Icu -->
+	<ICU_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\icu-52.1\include</ICU_INCLUDE_DIR>
+	<ICU_LIB_DIR>$(SCRIBUS_LIB_ROOT)\icu-52.1\lib\$(Platform)-$(PlatformToolset)</ICU_LIB_DIR>
+	<ICU_LIB>icudt.lib;icuin.lib;icuuc.lib</ICU_LIB>
 	<!-- Littlecms -->
     <LCMS_DIR>$(SCRIBUS_LIB_ROOT)\lcms2-2.7</LCMS_DIR>
 	<LCMS_INCLUDE_DIR>$(LCMS_DIR)\include</LCMS_INCLUDE_DIR>
@@ -69,6 +73,11 @@
 	<LIBJPEG_LIB_DIR>$(LIBJPEG_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBJPEG_LIB_DIR>
     <LIBJPEG_LIB Condition="'$(Configuration)' == 'Debug'">libjpeg9a_d.lib</LIBJPEG_LIB>
     <LIBJPEG_LIB Condition="'$(Configuration)' == 'Release'">libjpeg9a.lib</LIBJPEG_LIB>
+	<!-- Libmspub -->
+	<LIBMSPUB_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\libmspub-0.1.2\inc</LIBMSPUB_INCLUDE_DIR>
+	<LIBMSPUB_LIB_DIR>$(SCRIBUS_LIB_ROOT)\libmspub-0.1.2\lib\$(Platform)-$(PlatformToolset)</LIBMSPUB_LIB_DIR>
+    <LIBMSPUB_LIB Condition="'$(Configuration)' == 'Debug'">libmspub_d.lib</LIBMSPUB_LIB>
+    <LIBMSPUB_LIB Condition="'$(Configuration)' == 'Release'">libmspub.lib</LIBMSPUB_LIB>
 	<!-- Libpagemaker -->
 	<LIBPAGEMAKER_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\libpagemaker-0.0.2\inc</LIBPAGEMAKER_INCLUDE_DIR>
 	<LIBPAGEMAKER_LIB_DIR>$(SCRIBUS_LIB_ROOT)\libpagemaker-0.0.2\lib\$(Platform)-$(PlatformToolset)</LIBPAGEMAKER_LIB_DIR>

Modified: trunk/Scribus/win32/vc11/Scribus.sln
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20076&path=/trunk/Scribus/win32/vc11/Scribus.sln
==============================================================================
--- trunk/Scribus/win32/vc11/Scribus.sln (original)
+++ trunk/Scribus/win32/vc11/Scribus.sln Tue May 12 16:32:18 2015
@@ -305,6 +305,16 @@
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shapeplugin", "shapeplugin\shapeplugin.vcxproj", "{08A3346A-8DA3-4C32-AC44-20623EF46A71}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pagemakerimport", "pagemakerimport\pagemakerimport.vcxproj", "{DFABF9F6-3A94-441C-8E90-7C155278800E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pubimport", "pubimport\pubimport.vcxproj", "{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
 	EndProjectSection
@@ -813,6 +823,22 @@
 		{08A3346A-8DA3-4C32-AC44-20623EF46A71}.Release|Win32.Build.0 = Release|Win32
 		{08A3346A-8DA3-4C32-AC44-20623EF46A71}.Release|x64.ActiveCfg = Release|x64
 		{08A3346A-8DA3-4C32-AC44-20623EF46A71}.Release|x64.Build.0 = Release|x64
+		{DFABF9F6-3A94-441C-8E90-7C155278800E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DFABF9F6-3A94-441C-8E90-7C155278800E}.Debug|Win32.Build.0 = Debug|Win32
+		{DFABF9F6-3A94-441C-8E90-7C155278800E}.Debug|x64.ActiveCfg = Debug|x64
+		{DFABF9F6-3A94-441C-8E90-7C155278800E}.Debug|x64.Build.0 = Debug|x64
+		{DFABF9F6-3A94-441C-8E90-7C155278800E}.Release|Win32.ActiveCfg = Release|Win32
+		{DFABF9F6-3A94-441C-8E90-7C155278800E}.Release|Win32.Build.0 = Release|Win32
+		{DFABF9F6-3A94-441C-8E90-7C155278800E}.Release|x64.ActiveCfg = Release|x64
+		{DFABF9F6-3A94-441C-8E90-7C155278800E}.Release|x64.Build.0 = Release|x64
+		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Debug|Win32.Build.0 = Debug|Win32
+		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Debug|x64.ActiveCfg = Debug|x64
+		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Debug|x64.Build.0 = Debug|x64
+		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Release|Win32.ActiveCfg = Release|Win32
+		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Release|Win32.Build.0 = Release|Win32
+		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Release|x64.ActiveCfg = Release|x64
+		{82E27AFC-A3B2-49AD-9432-411AD3E1A4CD}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/Scribus/win32/vc11/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20076&path=/trunk/Scribus/win32/vc11/win-config.h
==============================================================================
--- trunk/Scribus/win32/vc11/win-config.h (original)
+++ trunk/Scribus/win32/vc11/win-config.h Tue May 12 16:32:18 2015
@@ -55,6 +55,9 @@
 /* Define if you have the development files for python */
 #define HAVE_PYTHON 1
 
+/* Define if you have the development files for librevenge */
+#define HAVE_REVENGE 1
+
 /* Define to 1 if you have the `snprintf' function. */
 #undef HAVE_SNPRINTF
 #ifdef _MSC_VER

More information about the scribus-commit mailing list