r16768 by jghali - msvc project update : add poppler as dependency, activate build of pdf importer plugin, disable legacy ps importer

Sun Aug 7 19:07:44 UTC 2011

Author: jghali
Date: Sun Aug  7 19:07:43 2011
New Revision: 16768

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16768
Log:
msvc project update : add poppler as dependency, activate build of pdf importer plugin, disable legacy ps importer
update build instructions for msvc

Added:
    trunk/Scribus/win32/vc9/pdfimport/
    trunk/Scribus/win32/vc9/pdfimport/pdfimport.vcproj
    trunk/Scribus/win32/vc9/pdfimport/pdfimportdll.cpp
Modified:
    trunk/Scribus/BUILDING_win32_msvc.txt
    trunk/Scribus/win32/vc9/Scribus-build.vsprops
    trunk/Scribus/win32/vc9/Scribus.sln
    trunk/Scribus/win32/vc9/win-config.h

Modified: trunk/Scribus/BUILDING_win32_msvc.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16768&path=/trunk/Scribus/BUILDING_win32_msvc.txt
==============================================================================

--- trunk/Scribus/BUILDING_win32_msvc.txt (original)
+++ trunk/Scribus/BUILDING_win32_msvc.txt Sun Aug  7 19:07:43 2011
@@ -13,14 +13,16 @@
 	- Microsoft Visual Studio 2008 or Visual C++ Express Edition 2008
 	- A recent Qt (version >= 4.6) release built with Visual Studio 2008
 	- Cairo sources from cairographics.org (version >= 1.8.0)
-	- Pixman sources from cairographics.org (version = 0.12.0)
+	- Pixman sources from cairographics.org (version >= 0.18.0)
 	- Boost from www.boost.org (version >= 1.35.0)
 	- Libxml2 win32 binaries from the Libxml project
 	- Libjpeg win32 libs and binaries from the GnuWin32 project
 	- Libtiff win32 libs and binaries from the GnuWin32 project
 	- Freetype sources from freetype.org (version >= 2.4.0)
 	- LittleCMS sources from www.littlecms.com (version >= 2.1)
-	- PoDoFo 0.8.x (and ONLY 0.8.x) sources from podofo.sourceforge.net
+	- PoDoFo sources (version >= 0.8.0) from podofo.sourceforge.net
+	- Poppler sources (version >= 0.17.1) from poppler.freedesktop.org
+	- Poppler data (version >= 0.4.4) from poppler.freedesktop.org
 	- A Python 2.7 Windows binary build.
       For debug builds, you'll need a release that contains the python27_d.dll .
 
@@ -67,6 +69,9 @@
 
 Adjust SCRIBUS_SRC_PATH, SCRIBUS_BUILD_ROOT and SCRIBUS_INSTALL_PATH as needed and run batch script.
 
+Download poppler data package on poppler.freedesktop.org. Copy content of archive 
+in %SCRIBUS_INSTALL_PATH%\share\poppler.
+
 Now copy the DLLs from the zlib, libpng, qt, lcms, freetype, libtiff, libjpeg,
 libxml, and podofo directories into the Scribus install directory (where
 scribus.exe is). Copy also the Dlls, lib and tcl directories from your python 
@@ -260,23 +265,46 @@
 
 Podofo sources can be downloaded from podofo.sourceforge.net. At the moment 
 those instructions are written, the recommended version to build Scribus on 
-Windows is one of the 0.8.x series. Podofo >= 0.9.0 will not work!!!!
+Windows is one of the 0.8.x series.
 
 Follow instructions in sources packages to build Podofo.
 
-You will however probably find easier to directly download packages with Visual 
-Studio 2008 solutions ready to build. You can find required file at 
+You will however probably find easier to directly download packages with a 
+Visual Studio 2008 solution ready to build. You can find required file at 
 following address :
 
 https://sourceforge.net/projects/scribus/files/scribus-libs/win32-msvc2008/
 
-Download the both scribus-podofo-* file. Unpack it.
-
-Open the podofo solution located in podofo-whatever directory and build 
-Debug and Release configurations of PoDoFoLib project.
+Download the scribus-podofo-*.zip archive. Unpack it.
+
+If present, open the PoDoFoLib-build.vsprops file located in podofo-whatever 
+directory and set all build variables according to your system. Then open the 
+podofo solution located in same directory and build Debug and Release configurations 
+of PoDoFoLib project.
 
 Note : freetype, libtiff and libjpeg must have been installed and if 
 necessary compiled before attempting to build podofo.
+
+---
+Poppler :
+
+Poppler sources can be downloaded http://poppler.freedesktop.org. At the moment
+those instruction are written, the only version known to work with scribus is 0.17.1.
+
+As Poppler is a bit tricky to build on Windows, you will however probably find easier 
+to directly download a ready to build package for Visual Studio 2008. You can find 
+required file at following address :
+
+https://sourceforge.net/projects/scribus/files/scribus-libs/win32-msvc2008/
+
+Download the scribus-poppler-*.zip archive. Unpack it.
+
+Open the poppler-build.vsprops file located in poppler-whatever\win32 directory and set
+all build variables according to your system. Then open the poppler.sln solution and 
+buid Debug-static and Release-static configurations.
+
+Note : freetype, libtiff and libjpeg must have been installed and if 
+necessary compiled before attempting to build poppler.
 
 ---
 Python : 

Modified: trunk/Scribus/win32/vc9/Scribus-build.vsprops
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16768&path=/trunk/Scribus/win32/vc9/Scribus-build.vsprops
==============================================================================
--- trunk/Scribus/win32/vc9/Scribus-build.vsprops (original)
+++ trunk/Scribus/win32/vc9/Scribus-build.vsprops Sun Aug  7 19:07:43 2011
@@ -6,7 +6,7 @@
 	>
 	<UserMacro
 		Name="QT4_DIR"
-		Value="F:\Libraries-vc9\qt-4.6.3"
+		Value="F:\Libraries-vc9\qt-4.7.3"
 	/>
 	<UserMacro
 		Name="BOOST_DIR"
@@ -18,7 +18,7 @@
 	/>
 	<UserMacro
 		Name="FREETYPE_DIR"
-		Value="F:\Libraries-vc9\freetype-2.4.2"
+		Value="F:\Libraries-vc9\freetype-2.4.6"
 	/>
 	<UserMacro
 		Name="ICONV_DIR"
@@ -26,7 +26,7 @@
 	/>
 	<UserMacro
 		Name="LCMS_DIR"
-		Value="F:\Libraries-vc9\lcms-2.0"
+		Value="F:\Libraries-vc9\lcms2-2.2"
 	/>
 	<UserMacro
 		Name="LIBJPEG_DIR"
@@ -42,7 +42,7 @@
 	/>
 	<UserMacro
 		Name="PODOFO_DIR"
-		Value="F:\Libraries-vc9\podofo-0.8.2"
+		Value="F:\Libraries-vc9\podofo-0.9.1"
 	/>
 	<UserMacro
 		Name="LIBXML2_DIR"
@@ -52,4 +52,8 @@
 		Name="PYTHON_DIR"
 		Value="F:\Libraries-vc9\Python-2.7.1"
 	/>
+	<UserMacro
+		Name="POPPLER_DIR"
+		Value="F:\Libraries-vc9\poppler-0.17.1"
+	/>
 </VisualStudioPropertySheet>

Modified: trunk/Scribus/win32/vc9/Scribus.sln
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16768&path=/trunk/Scribus/win32/vc9/Scribus.sln
==============================================================================
--- trunk/Scribus/win32/vc9/Scribus.sln (original)
+++ trunk/Scribus/win32/vc9/Scribus.sln Sun Aug  7 19:07:43 2011
@@ -32,11 +32,6 @@
 		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "psimport", "psimport\psimport.vcproj", "{6E8FF91A-DD16-4FAB-ACA5-8243453613F3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saveastemplate", "saveastemplate\saveastemplate.vcproj", "{F8CF727B-EF70-43DD-97F3-EDE68E0942D4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
@@ -256,6 +251,11 @@
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smoothpath", "smoothpath\smoothpath.vcproj", "{F3471C52-C0FF-4690-B9BF-9A97A6F2BA2F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdfimport", "pdfimport\pdfimport.vcproj", "{F58AF6DE-330F-48F5-97BB-ED2F30401712}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
 	EndProjectSection
@@ -290,10 +290,6 @@
 		{BCDD9765-B310-44EB-890A-1704A1D18619}.Debug-cairo|Win32.Build.0 = Debug-cairo|Win32
 		{BCDD9765-B310-44EB-890A-1704A1D18619}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
 		{BCDD9765-B310-44EB-890A-1704A1D18619}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
-		{6E8FF91A-DD16-4FAB-ACA5-8243453613F3}.Debug-cairo|Win32.ActiveCfg = Debug-cairo|Win32
-		{6E8FF91A-DD16-4FAB-ACA5-8243453613F3}.Debug-cairo|Win32.Build.0 = Debug-cairo|Win32
-		{6E8FF91A-DD16-4FAB-ACA5-8243453613F3}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
-		{6E8FF91A-DD16-4FAB-ACA5-8243453613F3}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
 		{F8CF727B-EF70-43DD-97F3-EDE68E0942D4}.Debug-cairo|Win32.ActiveCfg = Debug-cairo|Win32
 		{F8CF727B-EF70-43DD-97F3-EDE68E0942D4}.Debug-cairo|Win32.Build.0 = Debug-cairo|Win32
 		{F8CF727B-EF70-43DD-97F3-EDE68E0942D4}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
@@ -482,6 +478,10 @@
 		{F3471C52-C0FF-4690-B9BF-9A97A6F2BA2F}.Debug-cairo|Win32.Build.0 = Debug-cairo|Win32
 		{F3471C52-C0FF-4690-B9BF-9A97A6F2BA2F}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
 		{F3471C52-C0FF-4690-B9BF-9A97A6F2BA2F}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
+		{F58AF6DE-330F-48F5-97BB-ED2F30401712}.Debug-cairo|Win32.ActiveCfg = Debug-cairo|Win32
+		{F58AF6DE-330F-48F5-97BB-ED2F30401712}.Debug-cairo|Win32.Build.0 = Debug-cairo|Win32
+		{F58AF6DE-330F-48F5-97BB-ED2F30401712}.Release-cairo|Win32.ActiveCfg = Release-cairo|Win32
+		{F58AF6DE-330F-48F5-97BB-ED2F30401712}.Release-cairo|Win32.Build.0 = Release-cairo|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/Scribus/win32/vc9/win-config.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16768&path=/trunk/Scribus/win32/vc9/win-config.h
==============================================================================
--- trunk/Scribus/win32/vc9/win-config.h (original)
+++ trunk/Scribus/win32/vc9/win-config.h Sun Aug  7 19:07:43 2011
@@ -24,9 +24,6 @@
 
 /* Can we use unicode functions (Windows) */
 #define HAVE_UNICODE 1
-
-/* Define if you have the CoreAudio API */
-#undef HAVE_COREAUDIO
 
 /* Define to 1 if you have the <crt_externs.h> header file. */
 #undef HAVE_CRT_EXTERNS_H
@@ -70,11 +67,14 @@
 /* Define if your system needs _NSGetEnviron to set up the environment */
 #undef HAVE_NSGETENVIRON
 
+/* Define if you have the development files for podofo */
+#define HAVE_PODOFO 1
+
+/* Define if you have the development files for podofo */
+#define HVAE_POPPLER 1
+
 /* Define if you have the development files for python */
 #define HAVE_PYTHON 1
-
-/* Define if you have the development files for podofo */
-#define HAVE_PODOFO 1
 
 /* Python */
 #undef HAVE_PYTHON_23
@@ -137,27 +137,6 @@
 /* Defines if your system has the libxml2 library6 */
 #define HAVE_XML26 1
 
-/* Suffix for lib directories */
-#undef KDELIBSUFF
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
 /* The size of a `char *', as computed by sizeof. */
 #define SIZEOF_CHAR_P 4
 


