[ilovegom commit] r80 - in trunk/gom: . xulapp xulapp/app
codesite...@google.com
Date: Sun Aug 24 10:11:58 2008
New Revision: 80
Added:
trunk/gom/xulapp/Makefile.inc
trunk/gom/xulapp/mozconfig.in
- copied, changed from r79, /trunk/gom/xulapp/gom.mozconfig.in
Removed:
trunk/gom/xulapp/gom.mozconfig.in
Modified:
trunk/gom/ (props changed)
trunk/gom/ChangeLog
trunk/gom/Makefile.am
trunk/gom/configure.ac
trunk/gom/xulapp/ (props changed)
trunk/gom/xulapp/app/Makefile.in
Log:
2008-08-24 jacob <ja...@ilovegom.org>
* xulapp/mozconfig: remove mk_add_options, as we not longer use
client.mk
* xulapp/app/Makefile.in: disable some things for now
* xulapp/Makefile.inc: just run make in our mozilla objdir
* Makefile.am: move xulapp's build to xulapp/Makefile.inc
* configure.ac: run mozilla's configure here
Modified: trunk/gom/ChangeLog
==============================================================================
--- trunk/gom/ChangeLog (original)
+++ trunk/gom/ChangeLog Sun Aug 24 10:11:58 2008
@@ -1,3 +1,16 @@
+2008-08-24 jacob <ja...@ilovegom.org>
+
+ * xulapp/mozconfig: remove mk_add_options, as we not longer use
+ client.mk
+
+ * xulapp/app/Makefile.in: disable some things for now
+
+ * xulapp/Makefile.inc: just run make in our mozilla objdir
+
+ * Makefile.am: move xulapp's build to xulapp/Makefile.inc
+
+ * configure.ac: run mozilla's configure here
+
2008-08-23 jacob <ja...@ilovegom.org>
* move src/xulapp to xulapp, and build it using the mozilla build
Modified: trunk/gom/Makefile.am
==============================================================================
--- trunk/gom/Makefile.am (original)
+++ trunk/gom/Makefile.am Sun Aug 24 10:11:58 2008
@@ -31,14 +31,7 @@
DIST_SUBDIRS := $(SUBDIRS) $(include_subdirs)
-all: xulapp
-
-xulapp: include/gomwidgets.h
- @if ! test -L $(MOZILLA)/gom ; then \
- echo $(LN_S) $(top_srcdir)/xulapp $(MOZILLA)/gom; \
- $(LN_S) $(PWD)/xulapp $(MOZILLA)/gom; \
- fi
- $(MAKE) CPPFLAGS="$(CPPFLAGS) -I$$PWD/$(top_srcdir)/include
-I$$PWD/$(top_builddir)/include" -C $(MOZILLA)
MOZCONFIG=$(MOZILLA)/gom/gom.mozconfig -f client.mk build
+all:
include/gomwidgets.h: gomwidgets.in Makefile
-mkdir -p include
@@ -61,6 +54,7 @@
#include src/gom/Makefile.inc
#include src/libgom/Makefile.inc
include src/schema/Makefile.inc
+include xulapp/Makefile.inc
#include src/xpgom/Makefile.inc
#include src/xulapp/Makefile.inc
#include tests/Makefile.inc
@@ -70,5 +64,8 @@
echo " cp $(top_srcdir)/Makefile.am.subdir
$(top_srcdir)/$$dir/Makefile.am" ; \
cp "$(top_srcdir)/Makefile.am.subdir" "$(top_srcdir)/$$dir/Makefile.am" |
| exit 1 ; \
done
+
+clean:
+ -rm -rf mozilla
.PHONY: xulapp
Modified: trunk/gom/configure.ac
==============================================================================
--- trunk/gom/configure.ac (original)
+++ trunk/gom/configure.ac Sun Aug 24 10:11:58 2008
@@ -86,6 +86,11 @@
Makefile
xulapp/app/application.ini
xulapp/confvars.sh
-xulapp/gom.mozconfig
+xulapp/mozconfig
])
+
+AC_CONFIG_COMMANDS([configure-mozilla],
+ [$ac_top_srcdir/xulapp/configure-mozilla "$MOZILLA" "$ac_top_srcdir"],
+ [MOZILLA=$MOZILLA])
+
AC_OUTPUT
Added: trunk/gom/xulapp/Makefile.inc
==============================================================================
--- (empty file)
+++ trunk/gom/xulapp/Makefile.inc Sun Aug 24 10:11:58 2008
@@ -0,0 +1,6 @@
+# -*- Makefile -*-
+
+all: xulapp
+
+xulapp: include/gomwidgets.h xulapp/app/application.ini xulapp/confvars.sh
xulapp/mozconfig
+ $(MAKE) -C mozilla.obj
Modified: trunk/gom/xulapp/app/Makefile.in
==============================================================================
--- trunk/gom/xulapp/app/Makefile.in (original)
+++ trunk/gom/xulapp/app/Makefile.in Sun Aug 24 10:11:58 2008
@@ -113,19 +113,19 @@
else
-libs::
- cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX)
$(DIST)/bin/$(APP_BINARY)
- $(NSINSTALL) -D $(DIST)/bin/xulrunner
- (cd $(LIBXUL_DIST)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd
$(DIST)/bin/xulrunner && tar -xf -)
- cd $(DIST)/bin/xulrunner && $(RM) -f $(SDK_STRIP)
- cp $(srcdir)/../chrome/locales/$(MOZ_UI_LOCALE)/updater.ini
$(DIST)/bin/xulrunner
-# $(NSINSTALL) -D $(DIST)/bin/chrome/icons/default
-#ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-# cp $(srcdir)/default.png $(DIST)/bin/chrome/icons/default/default.png
+#libs::
+# cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX)
$(DIST)/bin/$(APP_BINARY)
+# $(NSINSTALL) -D $(DIST)/bin/xulrunner
+# (cd $(LIBXUL_DIST)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd
$(DIST)/bin/xulrunner && tar -xf -)
+# cd $(DIST)/bin/xulrunner && $(RM) -f $(SDK_STRIP)
+# cp $(srcdir)/../chrome/locales/$(MOZ_UI_LOCALE)/updater.ini
$(DIST)/bin/xulrunner
+## $(NSINSTALL) -D $(DIST)/bin/chrome/icons/default
+##ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+## cp $(srcdir)/default.png $(DIST)/bin/chrome/icons/default/default.png
+##endif
+#ifeq ($(OS_ARCH),WINNT)
+# cp $(srcdir)/default.ico $(DIST)/bin/chrome/icons/default/default.ico
+# $(DIST)/bin/redit $(DIST)/bin/$(APP_BINARY) $(srcdir)/default.ico
#endif
-ifeq ($(OS_ARCH),WINNT)
- cp $(srcdir)/default.ico $(DIST)/bin/chrome/icons/default/default.ico
- $(DIST)/bin/redit $(DIST)/bin/$(APP_BINARY) $(srcdir)/default.ico
-endif
endif #cocoa
Copied: trunk/gom/xulapp/mozconfig.in (from r79,
/trunk/gom/xulapp/gom.mozconfig.in)
==============================================================================
--- /trunk/gom/xulapp/gom.mozconfig.in (original)
+++ trunk/gom/xulapp/mozconfig.in Sun Aug 24 10:11:58 2008
@@ -2,8 +2,8 @@
@HAVE_MOZCONFIG_TRUE@. @MOZCONFIG@
# Options for client.mk.
-mk_add_options MOZ_CO_PROJECTS=xulrunner
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-gom
+mk_add_options MOZ_CO_PROJECT=browser
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/gom.obj
# Options for 'configure' (same as command-line options).
ac_add_options --with-libxul-sdk=@XULSDK@