GNOME.org
 

[pango/1.28: 3/4] Revert "Remove the .vcproj files before rewriting them"

commit d98a35b04f57cebdfdbe40750cd1fa998c730c42
Author: Behdad Esfahbod <behdad behdad org>
Date:   Tue Mar 30 15:07:35 2010 -0400

    Revert "Remove the .vcproj files before rewriting them"
    
    Revert .vcproj files and accompanying commits as the build stuff
    needs more work.

 Makefile.am                         |    4 +-
 README.win32                        |   28 ++-
 build/Makefile.am                   |    1 -
 build/win32/Makefile.am             |    1 -
 build/win32/vs9/Makefile.am         |   11 -
 build/win32/vs9/README.txt          |   35 ---
 build/win32/vs9/install.vcproj      |   78 -------
 build/win32/vs9/pango.sln           |   79 -------
 build/win32/vs9/pango.vcprojin      |  211 ------------------
 build/win32/vs9/pango.vsprops       |  137 ------------
 build/win32/vs9/pangocairo.vcprojin |  170 ---------------
 build/win32/vs9/pangoft2.vcprojin   |  408 -----------------------------------
 build/win32/vs9/pangowin32.vcproj   |  165 --------------
 build/win32/vs9/stdint.h            |   36 ---
 build/win32/vs9/unistd.h            |    1 -
 config.h.win32.in                   |  151 -------------
 configure.in                        |    9 +-
 modules/basic/basic-fc.c            |    1 -
 modules/basic/basic-win32.c         |    5 -
 modules/hebrew/hebrew-fc.c          |    1 -
 modules/thai/thai-fc.c              |    1 -
 pango/Makefile.am                   |   58 +-----
 pango/mini-fribidi/Makefile.am      |   10 -
 pango/module-defs-fc.c.win32        |   40 +++--
 pango/module-defs-lang.c.win32      |   11 -
 pango/module-defs-win32.c.win32     |   26 ++-
 pango/module-defs.h.win32           |   74 -------
 pango/opentype/Makefile.am          |   10 -
 pango/pangocairo.rc.in              |   30 ---
 29 files changed, 79 insertions(+), 1713 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b0b56ec..8b0889f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in.
 
-SUBDIRS= pango modules pango-view examples docs tools tests build
+SUBDIRS= pango modules pango-view examples docs tools tests
 
 EXTRA_DIST = 			\
 	autogen.sh		\
@@ -31,11 +31,9 @@ EXTRA_DIST = 			\
 	MAINTAINERS		\
 	HACKING			\
 	README.win32		\
-	config.h.win32		\
 	pango-zip.sh.in		\
 	sanitize-la.sh		\
 	pango.doap
-
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
 	$(srcdir)/aclocal.m4 \
diff --git a/README.win32 b/README.win32
index 283b6cb..68fcd8a 100644
--- a/README.win32
+++ b/README.win32
@@ -6,11 +6,11 @@ pangowin32). Much of the GDI font API calls are in cairo.
 The pangoft2 backend was originally written with Win32 in mind, but
 its main use nowadays is on other platforms than Win32.
 
-There are three ways to build Pango for Win32:
+There are two ways to build Pango for Win32:
 
 1) Use gcc (mingw), libtool, make, like on Unix.
 
-If building from git, run the autogen.sh script that runs aclocal,
+If building from CVS, run the autogen.sh script that runs aclocal,
 automake, autoconf and configure to build makefiles etc. This is what
 tml novell com uses. Pass the same switches to autogen.sh that you
 would pass to the configure script.
@@ -20,15 +20,31 @@ make should be enough. But, as always, you need to understand what is
 happening and follow the progress in case manual intervention is
 needed.
 
+If you want to support complex scripts (which you should!), you need
+the usp10.h header from the Platform SDK. Otherwise the basic-win32
+shaper module won' use Uniscribe and for instance Arabic and Indic
+scripts will look like crap. (Yes, complex script support *is*
+important. It is one of the main selling points of GTK+ and Pango.)
+Pass the --with-usp10 flag to the configure script to tell it where
+you have the Platform SDK (or other source of an "usp10.h" or
+"include/usp10.h" file).
+
 tml ran the configure script like this when building binaries for
 Pango 1.10.0:
 
-PATH=/devel/dist/glib-2.8.0/bin:$PATH ACLOCAL_FLAGS="-I /devel/dist/glib-2.8.0/share/aclocal" PKG_CONFIG_PATH=/devel/dist/glib-2.8.0/lib/pkgconfig:$PKG_CONFIG_PATH CC='gcc -mtune=pentium3' CPPFLAGS='-I/opt/gnu/include' LDFLAGS='-L/opt/gnu/lib' CFLAGS=-O ./configure --disable-gtk-doc  --without-x --prefix=c:/devel/target/pango-1.10.0
+PATH=/devel/dist/glib-2.8.0/bin:$PATH ACLOCAL_FLAGS="-I /devel/dist/glib-2.8.0/share/aclocal" PKG_CONFIG_PATH=/devel/dist/glib-2.8.0/lib/pkgconfig:$PKG_CONFIG_PATH CC='gcc -mtune=pentium3' CPPFLAGS='-I/opt/gnu/include' LDFLAGS='-L/opt/gnu/lib' CFLAGS=-O ./configure --disable-gtk-doc --with-usp10=/opt/psdk  --without-x --prefix=c:/devel/target/pango-1.10.0
+
+The pango.modules file tends not to get automatically set up correctly
+on Win32. Check that. Also make sure you set up a pango.aliases file
+if you want to support non-Latin scripts. pango.aliases file used by
+tml looks like this:
 
-2) Use Visual Studio 2008. Use the solution file in
-build/win32/vs9. See the README.txt there for more information.
+tahoma = "tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal"
+sans = "arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal"
+serif = "times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,latha,mangal"
+monospace = "courier new,courier monothai,mingliu,simsun,gulimche,ms gothic,latha,mangal"
 
-3) Use MSVC and nmake. Use the makefile.msc makefiles. These makefiles
+2) Use MSVC and nmake. Use the makefile.msc makefiles. These makefiles
 are supported by Hans Breuer. They requires manual editing. You need
 to have the source code to some suitable version of glib in a sibling
 directory. Ask Hans for advice.
diff --git a/configure.in b/configure.in
index 2e03066..8e2bebc 100644
--- a/configure.in
+++ b/configure.in
@@ -758,9 +758,9 @@ for module in $included_modules; do
   module_c=`echo $module | sed s/-/_/`
   cat >> pango/module-defs.h <<EOTEXT
 extern void         _pango_${module_c}_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_${module_c}_script_engine_init (GTypeModule *module);
+extern PangoEngine *_pango_${module_c}_script_engine_init (GTypeModule *module);
 extern void         _pango_${module_c}_script_engine_exit (void);
-extern PangoEngine *_pango_${module_c}_script_engine_create (const char *id);
+extern void         _pango_${module_c}_script_engine_create (const char *id);
 
 EOTEXT
 done 
@@ -963,7 +963,6 @@ pango/opentype/Makefile
 pango/pango.rc
 pango/pangoft2.rc
 pango/pangowin32.rc
-pango/pangocairo.rc
 pango/pangox.rc
 pango/pangoxft.rc
 pango-view/Makefile
@@ -982,9 +981,6 @@ docs/Makefile
 docs/version.xml
 tools/Makefile
 tests/Makefile
-build/Makefile
-build/win32/Makefile
-build/win32/vs9/Makefile
 pango.pc
 pangox.pc
 pangowin32.pc
@@ -998,7 +994,6 @@ pangoft2-uninstalled.pc
 pangoxft-uninstalled.pc
 pangocairo-uninstalled.pc
 pango-zip.sh
-config.h.win32
 ])
 
 AC_CONFIG_FILES([tests/runtests.sh],
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index e3852c3..6e0d2ef 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include <glib/gprintf.h>
-
 #include "pango-engine.h"
 #include "pango-utils.h"
 #include "pangofc-font.h"
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c
index 1565a7c..ecb139e 100644
--- a/modules/basic/basic-win32.c
+++ b/modules/basic/basic-win32.c
@@ -30,11 +30,6 @@
 #include <glib.h>
 
 #include "pangowin32.h"
-
-#ifndef PANGO_MODULE_PREFIX
-#define PANGO_MODULE_PREFIX _pango_basic_win32
-#endif
-
 #include "pango-engine.h"
 #include "pango-utils.h"
 
diff --git a/modules/hebrew/hebrew-fc.c b/modules/hebrew/hebrew-fc.c
index 12f25c5..fcfed2b 100644
--- a/modules/hebrew/hebrew-fc.c
+++ b/modules/hebrew/hebrew-fc.c
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include <pango/pango-ot.h>
-
 #include "pango-engine.h"
 #include "pango-utils.h"
 #include "pangofc-font.h"
diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c
index 80c945d..837a028 100644
--- a/modules/thai/thai-fc.c
+++ b/modules/thai/thai-fc.c
@@ -32,7 +32,6 @@
 
 #include <glib.h>
 #include "pango-ot.h"
-
 #include "pango-engine.h"
 #include "pangofc-font.h"
 
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 37510fa..cef644f 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -14,6 +14,8 @@ if HAVE_FREETYPE
 OPENTYPE_SUBDIR=opentype
 endif
 
+EXTRA_DIST = 
+
 FRIBIDI_SUBDIR=mini-fribidi
 
 SUBDIRS = $(OPENTYPE_SUBDIR) $(FRIBIDI_SUBDIR)
@@ -348,23 +350,18 @@ libpangocairo_1_0_la_LIBADD =			\
 	$(libm)
 libpangocairo_1_0_la_DEPENDENCIES =		\
 	libpango-$(PANGO_API_VERSION).la
-pangocairo_core_sources = \
+libpangocairo_1_0_la_SOURCES =  \
 	pangocairo-context.c    \
 	pangocairo-font.c	\
 	pangocairo-fontmap.c    \
 	pangocairo-render.c	\
 	pangocairo-private.h
 
-libpangocairo_1_0_la_SOURCES = $(pangocairo_core_sources)
-
 if HAVE_CAIRO_WIN32
 if PLATFORM_WIN32
-libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def -Wl,pangocairo-win32-res.o
-libpangocairo_1_0_la_DEPENDENCIES += pangocairo-win32-res.o pangocairo.def
+libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def
+libpangocairo_1_0_la_DEPENDENCIES += pangocairo.def
 endif
-pangocairo-win32-res.o: pangocairo.rc
-	$(AM_V_GEN) $(WINDRES) $< $@
-
 
 libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS)
 libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la 
@@ -559,11 +556,9 @@ pango_querymodules_LDADD += libpangowin32-$(PANGO_API_VERSION).la
 endif
 pango_querymodules_LDADD += libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
 
-EXTRA_DIST =					\
+EXTRA_DIST +=					\
 	pango-enum-types.h			\
 	module-defs.h				\
-	module-defs.h.win32			\
-	module-defs-lang.c.win32		\
 	module-defs-fc.c.win32			\
 	module-defs-win32.c.win32		\
 	pango.def				\
@@ -578,8 +573,6 @@ EXTRA_DIST =					\
 	pangoft2.rc.in				\
 	pangowin32.rc				\
 	pangowin32.rc.in			\
-	pangocairo.rc				\
-	pangocairo.rc.in			\
 	pangox.rc				\
 	pangox.rc.in				\
 	pangoxft.rc				\
@@ -637,43 +630,4 @@ uninstall-local: uninstall-ms-lib uninstall-def-files
 
 TESTS = check.defs
 
-dist-hook: \
-	../build/win32/vs9/pango.vcproj \
-	../build/win32/vs9/pangoft2.vcproj \
-	../build/win32/vs9/pangocairo.vcproj
-
-# pangowin32.vcproj is not automatically built, it is not being changed
-
-../build/win32/vs9/pango.vcproj: $(top_srcdir)/build/win32/vs9/pango.vcprojin mini-fribidi/libmini-fribidi.sourcefiles
-	-rm $@
-	for F in $(libpango_1_0_la_SOURCES); do \
-		case $$F in \
-		*.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libpango.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/pango.vcprojin >$@
-
-../build/win32/vs9/pangoft2.vcproj: $(top_srcdir)/build/win32/vs9/pangoft2.vcprojin opentype/libharfbuzz.sourcefiles
-	-rm $@
-	for F in $(libpangoft2_1_0_la_SOURCES); do \
-		case $$F in \
-		*.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libpangoft2.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/pangoft2.vcprojin >$@
-
-../build/win32/vs9/pangocairo.vcproj: $(top_srcdir)/build/win32/vs9/pangocairo.vcprojin
-# Backend-specific sources for the libpangocairo DLL are explicitly
-# listed in the vcprojin file
-	-rm $@
-	for F in $(pangocairo_core_sources); do \
-		case $$F in \
-		*.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libpangocairo.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/pangocairo.vcprojin >$@
-
 -include $(top_srcdir)/git.mk
diff --git a/pango/mini-fribidi/Makefile.am b/pango/mini-fribidi/Makefile.am
index a0baa6b..a9e08d6 100644
--- a/pango/mini-fribidi/Makefile.am
+++ b/pango/mini-fribidi/Makefile.am
@@ -30,14 +30,4 @@ EXTRA_DIST = 			\
         fribidi_types.i
 
 
-dist-hook: libmini-fribidi.sourcefiles
-
-libmini-fribidi.sourcefiles: Makefile
-	for F in $(libmini_fribidi_la_SOURCES); do \
-		case $$F in \
-		*.c) echo '			<File RelativePath="..\..\..\pango\mini-fribidi\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libmini-fribidi.sourcefiles
-
 -include $(top_srcdir)/git.mk
diff --git a/pango/module-defs-fc.c.win32 b/pango/module-defs-fc.c.win32
index 7a44537..a6ae1cf 100644
--- a/pango/module-defs-fc.c.win32
+++ b/pango/module-defs-fc.c.win32
@@ -1,17 +1,31 @@
-/* Autogenerated by configure and then saved for use when compiling with
-   Visual C. */
+/* Hand-written. Once the GNU configure mechanism is used
+ * on Win32, too, can be generated.
+*/
 
-#include "module-defs.h"
+#include "modules.h"
+
+#ifdef PANGO_MODULE_PREFIX
+/* by defining PANGO_MODULE_PREFIX the basic module gets include in the
+ * backend library, here ../modules/basic/basic-fc.c
+ * It helps the backend to not fall on its nose even with a screwed module
+ * configuration. There should be at least enough fonts available to show
+ * an error message ...
+ */
+void         _pango_basic_ft2_script_engine_list   (PangoEngineInfo **engines,
+                                                    gint             *n_engines);
+void         _pango_basic_ft2_script_engine_init   (GTypeModule      *module);
+void         _pango_basic_ft2_script_engine_exit   (void);
+PangoEngine *_pango_basic_ft2_script_engine_create (const char       *id);
+#endif
 
 PangoIncludedModule _pango_included_fc_modules[] = {
- { _pango_arabic_fc_script_engine_list, _pango_arabic_fc_script_engine_init, _pango_arabic_fc_script_engine_exit, _pango_arabic_fc_script_engine_create },
- { _pango_basic_fc_script_engine_list, _pango_basic_fc_script_engine_init, _pango_basic_fc_script_engine_exit, _pango_basic_fc_script_engine_create },
- { _pango_hangul_fc_script_engine_list, _pango_hangul_fc_script_engine_init, _pango_hangul_fc_script_engine_exit, _pango_hangul_fc_script_engine_create },
- { _pango_hebrew_fc_script_engine_list, _pango_hebrew_fc_script_engine_init, _pango_hebrew_fc_script_engine_exit, _pango_hebrew_fc_script_engine_create },
- { _pango_indic_fc_script_engine_list, _pango_indic_fc_script_engine_init, _pango_indic_fc_script_engine_exit, _pango_indic_fc_script_engine_create },
- { _pango_khmer_fc_script_engine_list, _pango_khmer_fc_script_engine_init, _pango_khmer_fc_script_engine_exit, _pango_khmer_fc_script_engine_create },
- { _pango_syriac_fc_script_engine_list, _pango_syriac_fc_script_engine_init, _pango_syriac_fc_script_engine_exit, _pango_syriac_fc_script_engine_create },
- { _pango_thai_fc_script_engine_list, _pango_thai_fc_script_engine_init, _pango_thai_fc_script_engine_exit, _pango_thai_fc_script_engine_create },
- { _pango_tibetan_fc_script_engine_list, _pango_tibetan_fc_script_engine_init, _pango_tibetan_fc_script_engine_exit, _pango_tibetan_fc_script_engine_create },
- { NULL, NULL, NULL, NULL },
+#ifdef PANGO_MODULE_PREFIX
+ { 
+   _pango_basic_ft2_script_engine_list,  
+   _pango_basic_ft2_script_engine_init, 
+   _pango_basic_ft2_script_engine_exit,  
+   _pango_basic_ft2_script_engine_create 
+ },
+#endif
+ { NULL, NULL, NULL },
 };
diff --git a/pango/module-defs-win32.c.win32 b/pango/module-defs-win32.c.win32
index 5c1698c..80fc90a 100644
--- a/pango/module-defs-win32.c.win32
+++ b/pango/module-defs-win32.c.win32
@@ -1,9 +1,25 @@
-/* Autogenerated by configure and then saved for use when compiling with
-   Visual C. */
+/* Hand-written, for builds using Microsoft's compiler and makefile.msc,
+ * where the configure mechanism isn't used.
+ */
 
-#include "module-defs.h"
+#include "modules.h"
+
+#ifdef PANGO_MODULE_PREFIX
+void         _pango_basic_win32_script_engine_list   (PangoEngineInfo **engines,
+                                                      gint             *n_engines);
+void         _pango_basic_win32_script_engine_init   (GTypeModule      *module);
+void         _pango_basic_win32_script_engine_exit   (void);
+PangoEngine *_pango_basic_win32_script_engine_create (const char       *id);
+#endif
 
 PangoIncludedModule _pango_included_win32_modules[] = {
- { _pango_basic_win32_script_engine_list, _pango_basic_win32_script_engine_init, _pango_basic_win32_script_engine_exit, _pango_basic_win32_script_engine_create },
- { NULL, NULL, NULL, NULL },
+#ifdef PANGO_MODULE_PREFIX
+ { 
+   _pango_basic_win32_script_engine_list,  
+   _pango_basic_win32_script_engine_init, 
+   _pango_basic_win32_script_engine_exit,  
+   _pango_basic_win32_script_engine_create 
+ },
+#endif
+ { NULL, NULL, NULL },
 };
diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am
index 23bb55b..ebec8ce 100644
--- a/pango/opentype/Makefile.am
+++ b/pango/opentype/Makefile.am
@@ -55,14 +55,4 @@ main_LDADD = libharfbuzz.la $(GLIB_LIBS)
 
 EXTRA_DIST = README COPYING
 
-dist-hook: libharfbuzz.sourcefiles
-
-libharfbuzz.sourcefiles: Makefile
-	for F in $(libharfbuzz_la_SOURCES); do \
-		case $$F in \
-		*.c|*.cc) echo '   <File RelativePath="..\..\..\pango\opentype\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libharfbuzz.sourcefiles
-
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]