build system for standalone Composer; b=215795, r=cls@seawood.org, sr=scott@scott-macgregor.org

2003-09-24 13:59:37 +00:00 · 2003-09-24 13:59:37 +00:00 · d3099c31e9
--- a/Makefile.in
+++ b/Makefile.in
@ -313,6 +313,10 @@ ifdef MOZ_THUNDERBIRD
 tier_99_dirs	+= mail
 endif

+ifdef MOZ_STANDALONE_COMPOSER
+tier_99_dirs	+= composer
+endif
+
 ifdef MOZ_XUL_APP
 else
 ifneq (,$(MOZ_XPFE_COMPONENTS)$(MOZ_XUL))
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@ -924,6 +924,14 @@ mail/config/Makefile
 xpfe/components/build2/Makefile
 "

+MAKEFILES_standalone_composer="
+composer/Makefile
+composer/app/Makefile
+composer/app/profile/Makefile
+composer/base/Makefile
+xpfe/components/build2/Makefile
+"
+
 MAKEFILES_sql="
 extensions/sql/Makefile
 extensions/sql/base/Makefile
@ -1402,6 +1410,10 @@ if test -n "$MOZ_THUNDERBIRD"; then
    add_makefiles "$MAKEFILES_thunderbird"
 fi

+if test -n "$MOZ_STANDALONE_COMPOSER"; then
+    add_makefiles "$MAKEFILES_standalone_composer"
+fi
+
 if test -n "$MOZ_IPCD"; then
    add_makefiles "$MAKEFILES_ipcd"
 fi
--- a/client.mk
+++ b/client.mk
@ -63,6 +63,7 @@ IPC_CO_TAG = IPC_BRANCH_20030304
 TOOLKIT_CO_TAG =
 BROWSER_CO_TAG =
 MAIL_CO_TAG =
+STANDALONE_COMPOSER_CO_TAG =
 BUILD_MODULES = all

 #######################################################################
@ -412,6 +413,28 @@ FASTUPDATE_THUNDERBIRD := true
 CHECKOUT_THUNDERBIRD := true
 endif

+####################################
+# CVS defines for Standalone Composer (pulled and built if MOZ_STANDALONE_COMPOSER is set)
+#
+
+STANDALONE_COMPOSER_CO_FLAGS := -P
+ifdef MOZ_CO_FLAGS
+  STANDALONE_COMPOSER_CO_FLAGS := $(MOZ_CO_FLAGS)
+endif
+ifdef STANDALONE_COMPOSER_CO_TAG
+  STANDALONE_COMPOSER_CO_FLAGS := $(STANDALONE_COMPOSER_CO_FLAGS) -r $(STANDALONE_COMPOSER_CO_TAG)
+endif
+
+CVSCO_STANDALONE_COMPOSER := $(CVS) $(CVS_FLAGS) co $(STANDALONE_COMPOSER_CO_FLAGS) $(CVS_CO_DATE_FLAGS) mozilla/composer
+ifdef MOZ_STANDALONE_COMPOSER
+FASTUPDATE_STANDALONE_COMPOSER:= fast_update $(CVSCO_STANDALONE_COMPOSER)
+CHECKOUT_STANDALONE_COMPOSER:= cvs_co $(CVSCO_STANDALONE_COMPOSER)
+MOZ_XUL_APP = 1
+else
+FASTUPDATE_STANDALONE_COMPOSER:= true
+CHECKOUT_STANDALONE_COMPOSER:= true
+endif
+
 ####################################
 # CVS defines for mozilla/toolkit (pulled and built if MOZ_XUL_APP is set)
 #
@ -517,6 +540,7 @@ real_checkout:
 	$(CHECKOUT_MOZTOOLKIT) && \
 	$(CHECKOUT_PHOENIX) && \
 	$(CHECKOUT_THUNDERBIRD) && \
+	$(CHECKOUT_STANDALONE_COMPOSER) && \
 	$(CHECKOUT_CODESIGHS) && \
 	cvs_co $(CVSCO_SEAMONKEY)
 	@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
@ -584,6 +608,7 @@ real_fast-update:
 	$(FASTUPDATE_MOZTOOLKIT) && \
 	$(FASTUPDATE_PHOENIX) && \
 	$(FASTUPDATE_THUNDERBIRD) && \
+	$(FASTUPDATE_STANDALONE_COMPOSER) && \
 	$(FASTUPDATE_CODESIGHS) && \
 	fast_update $(CVSCO_SEAMONKEY)
 	@echo "fast_update finish: "`date` | tee -a $(CVSCO_LOGFILE)
--- a/composer/readme.html
+++ b/composer/readme.html
@ -1,19 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-  <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
+  <meta content="text/html; charset=ISO-8859-1"
+ http-equiv="content-type">
  <title>Building Standalone Composer</title>
 </head>
 <body>
 <h2 style="border-bottom: thin solid black;">Getting the source and
 building Standalone Composer</h2>
-<h4
- style="border: thick solid green; margin: 0px 20%; padding: 1em; color: red;">WARNING:
-the changes
-to the build system needed to build Standalone Composer are not checked
-in yet. This implies the above does not work yet... Be patient ;-)<br>
-</h4>
 <h3>UNIX, Windows (gmake)</h3>
 <ol>
  <li>Create a .mozconfig file in your home directory, or in the
@ -21,7 +15,8 @@ mozilla directory, containing the following:<br>
    <br>
    <code>ac_add_options --enable-crypto<br>
 ac_add_options --disable-debug<br>
-ac_add_options --enable-optimize=-O2<br>
+    <span style="color: rgb(255, 0, 0);">ac_add_options
+--enable-optimize=-O2</span><br>
 ac_add_options --disable-ldap<br>
 ac_add_options --disable-mailnews<br>
 ac_add_options --disable-mathml<br>
@ -42,12 +37,20 @@ ac_add_options --enable-image-decoders=icon,png,gif,jpeg<br>
 export MOZ_STANDALONE_COMPOSER=1<br>
 mk_add_options MOZ_STANDALONE_COMPOSER=1<br>
    <br>
-    </code><span style="font-weight: bold;">Warning</span>: DO NOT USE <code>--enable-optimize=-O2</code>
-on Windows. There are bugs. Simply use <code>--enable-optimize</code>.
+    </code>
+    <p><span style="font-weight: bold; color: rgb(255, 0, 0);">Warning</span>:
+DO NOT USE <code>--enable-optimize=-O2</code>
+on Windows. There are bugs. Simply use <code>--enable-optimize</code>.</p>
  </li>
  <li>Pull from CVS and build as described in the <a
 href="http://www.mozilla.org/build/unix.html">Mozilla build
-instructions</a>. </li>
+instructions</a>.</li>
+  <li>If your build breaks in mozilla/toolkit/components/console,
+during some JAR packaging, you may be running into <a
+ href="http://bugzilla.mozilla.org/show_bug.cgi?id=206785">Bug #206785</a>
+where the xul pre-processor is dying. A temporary work around is listed
+in the bug, just replace MOZ_THUNDERBIRD by MOZ_STANDALONE_COMPOSER<br>
+  </li>
  <li>Run the <code>composer </code>executable that is left in
 dist/bin</li>
 </ol>
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@ -417,6 +417,7 @@ MOZ_MAPINFO	= @MOZ_MAPINFO@
 MOZ_PHOENIX	= @MOZ_PHOENIX@
 MOZ_XUL_APP	= @MOZ_XUL_APP@
 MOZ_THUNDERBIRD = @MOZ_THUNDERBIRD@
+MOZ_STANDALONE_COMPOSER= @MOZ_STANDALONE_COMPOSER@
 MOZ_STATIC_MAIL_BUILD = @MOZ_STATIC_MAIL_BUILD@

 MOZ_COMPONENTLIB = @MOZ_COMPONENTLIB@
--- a/15
+++ b/15
@ -11334,6 +11334,20 @@ fi



+if test "$MOZ_STANDALONE_COMPOSER"; then
+   cat >> confdefs.h <<\EOF
+#define MOZ_STANDALONE_COMPOSER 1
+EOF
+
+   MOZ_XUL_APP=1
+   cat >> confdefs.h <<\EOF
+#define MOZ_XUL_APP 1
+EOF
+
+fi
+
+
+

 # Check whether --enable-freetype2 or --disable-freetype2 was given.
 if test "${enable_freetype2+set}" = set; then
@ -15489,6 +15503,7 @@ s%@MOZ_MAIL_NEWS@%$MOZ_MAIL_NEWS%g
 s%@MOZ_STATIC_MAIL_BUILD@%$MOZ_STATIC_MAIL_BUILD%g
 s%@MOZ_PHOENIX@%$MOZ_PHOENIX%g
 s%@MOZ_THUNDERBIRD@%$MOZ_THUNDERBIRD%g
+s%@MOZ_STANDALONE_COMPOSER@%$MOZ_STANDALONE_COMPOSER%g
 s%@MOZ_XUL_APP@%$MOZ_XUL_APP%g
 s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
 s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
--- a/configure.in
+++ b/configure.in
@ -3282,6 +3282,19 @@ fi
 AC_SUBST(MOZ_THUNDERBIRD)
 AC_SUBST(MOZ_XUL_APP)

+dnl ========================================================
+dnl = Standalone Composer
+dnl ========================================================
+if test "$MOZ_STANDALONE_COMPOSER"; then
+   AC_DEFINE(MOZ_STANDALONE_COMPOSER)
+   
+   MOZ_XUL_APP=1
+   AC_DEFINE(MOZ_XUL_APP)
+fi
+
+AC_SUBST(MOZ_STANDALONE_COMPOSER)
+AC_SUBST(MOZ_XUL_APP)
+
 dnl ========================================================
 dnl = FreeType2
 dnl = Enable freetype by default if building against X11 
--- a/xpfe/components/Makefile.in
+++ b/xpfe/components/Makefile.in
@ -88,8 +88,12 @@ DIRS		+= xremote
 endif

 ifndef MOZ_THUNDERBIRD
+ifndef MOZ_STANDALONE_COMPOSER
 DIRS		+= build
 else
+DIRS		+= build2
+endif
+else
 DIRS	        += build2
 endif