[ilovegom commit] r81 - in trunk/gom: . include xulapp

0 views

Skip to first unread message

codesite...@google.com

unread,

Aug 26, 2008, 3:20:27 AM8/26/08

to gom-c...@googlegroups.com

Author: ja...@87k.net
Date: Tue Aug 26 00:19:28 2008
New Revision: 81

Added:
trunk/gom/include/gomwidgets.in
- copied unchanged from r79, /trunk/gom/gomwidgets.in
trunk/gom/xulapp/configure-mozilla (contents, props changed)
Removed:
trunk/gom/gomwidgets.in
Modified:
trunk/gom/ChangeLog
trunk/gom/Makefile.am
trunk/gom/configure.ac
trunk/gom/include/Makefile.inc
trunk/gom/xulapp/Makefile.inc

Log:
2008-08-24 jacob <ja...@ilovegom.org>

* configure.ac: use a source file we actually dist to configure
the sourcedir

* xulapp/Makefile.inc: dist all the files in this directory

* xulapp/configure-mozilla: a script which will run configure on a
mozilla source tree

Modified: trunk/gom/ChangeLog
==============================================================================
--- trunk/gom/ChangeLog (original)
+++ trunk/gom/ChangeLog Tue Aug 26 00:19:28 2008
@@ -1,6 +1,14 @@
2008-08-24 jacob <ja...@ilovegom.org>

- * xulapp/mozconfig: remove mk_add_options, as we not longer use
+ * configure.ac: use a source file we actually dist to configure
+ the sourcedir
+
+ * xulapp/Makefile.inc: dist all the files in this directory
+
+ * xulapp/configure-mozilla: a script which will run configure on a
+ mozilla source tree
+
+ * xulapp/mozconfig: remove mk_add_options, as we no longer use
client.mk

* xulapp/app/Makefile.in: disable some things for now

Modified: trunk/gom/Makefile.am
==============================================================================
--- trunk/gom/Makefile.am (original)
+++ trunk/gom/Makefile.am Tue Aug 26 00:19:28 2008
@@ -22,7 +22,8 @@

AM_CPPFLAGS :=

-dist_noinst_DATA := Makefile.am.subdir gomwidgets.in
+dist_noinst_DATA := Makefile.am.subdir
+dist_noinst_HEADERS :=
noinst_PROGRAMS :=

SUBDIRS = .
@@ -33,20 +34,9 @@

all:

-include/gomwidgets.h: gomwidgets.in Makefile
- -mkdir -p include
- cp $< $@.tmp
- chmod +w $@.tmp
- awk '/GTK_TYPE_.*get_type/ { print "WIDGET ("$$2")" }' \
- $(shell pkg-config --variable includedir gtk+-2.0)/gtk-2.0/gtk/*.h \
- >> $@.tmp
- @if ! cmp $@.tmp $@ ; then \
- echo cp $@.tmp $@; \
- cp $@.tmp $@; \
- fi
-
include examples/Makefile.inc
#include idl/Makefile.inc
+include include/Makefile.inc
#include include/gom/Makefile.inc
#include include/gom/dom/Makefile.inc
#include include/Makefile.inc
@@ -64,8 +54,3 @@
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 Tue Aug 26 00:19:28 2008
@@ -4,7 +4,7 @@
AC_PREREQ(2.59)
AC_INIT([gom], [0.3], [http://code.google.com/p/ilovegom/issues/entry])
AM_INIT_AUTOMAKE([foreign])
-AC_CONFIG_SRCDIR([src/gom/gom.c])
+AC_CONFIG_SRCDIR([xulapp/components/gom/src/xgGomModule.cpp])
AC_CONFIG_HEADER([config.h])

AC_ARG_WITH([libxul-sdk],

Modified: trunk/gom/include/Makefile.inc
==============================================================================
--- trunk/gom/include/Makefile.inc (original)
+++ trunk/gom/include/Makefile.inc Tue Aug 26 00:19:28 2008
@@ -1,3 +1,19 @@
# -*- Makefile -*-

+dist_noinst_DATA += include/gomwidgets.in
dist_noinst_HEADERS += include/gommacros.h
+
+CLEANFILES += include/gomwidgets.h
+
+include/gomwidgets.h: include/gomwidgets.in include/Makefile.inc
+ -mkdir -p include
+ cp $< $@.tmp
+ chmod +w $@.tmp
+ awk '/GTK_TYPE_.*get_type/ { print "WIDGET ("$$2")" }' \
+ $(shell pkg-config --variable includedir gtk+-2.0)/gtk-2.0/gtk/*.h \
+ >> $@.tmp
+ @if ! cmp $@.tmp $@ ; then \
+ echo cp $@.tmp $@; \
+ cp $@.tmp $@; \
+ fi
+ rm -f $@.tmp

Modified: trunk/gom/xulapp/Makefile.inc
==============================================================================
--- trunk/gom/xulapp/Makefile.inc (original)
+++ trunk/gom/xulapp/Makefile.inc Tue Aug 26 00:19:28 2008
@@ -4,3 +4,56 @@

xulapp: include/gomwidgets.h xulapp/app/application.ini xulapp/confvars.sh
xulapp/mozconfig
$(MAKE) -C mozilla.obj
+
+clean:
+ $(MAKE) -C mozilla.obj clean
+
+.PHONY: xulapp
+
+distclean: maintainer-clean
+ rm -rf mozilla.obj
+
+dist_noinst_DATA += xulapp/Makefile.in
+dist_noinst_DATA += xulapp/build.mk
+dist_noinst_DATA += xulapp/configure-mozilla
+dist_noinst_DATA += xulapp/confvars.sh
+
+dist_noinst_DATA += xulapp/app/Makefile.in
+dist_noinst_DATA += xulapp/app/application.ini
+dist_noinst_DATA += xulapp/app/default-prefs.js
+dist_noinst_DATA += xulapp/app/channel-prefs.js
+
+dist_noinst_DATA += xulapp/chrome/Makefile.in
+
+dist_noinst_DATA += xulapp/chrome/branding/Makefile.in
+dist_noinst_DATA += xulapp/chrome/branding/brand.properties
+dist_noinst_DATA += xulapp/chrome/branding/jar.mn
+
+dist_noinst_DATA += xulapp/chrome/content/Makefile.in
+dist_noinst_DATA += xulapp/chrome/content/gom.js
+dist_noinst_DATA += xulapp/chrome/content/gom.xul
+dist_noinst_DATA += xulapp/chrome/content/jar.mn
+
+dist_noinst_DATA += xulapp/chrome/locales/Makefile.in
+dist_noinst_DATA += xulapp/chrome/locales/jar.mn
+
+dist_noinst_DATA += xulapp/chrome/locales/en-US/updater.ini
+
+dist_noinst_DATA += xulapp/components/Makefile.in
+
+dist_noinst_DATA += xulapp/components/gom/Makefile.in
+
+dist_noinst_DATA += xulapp/components/gom/public/Makefile.in
+dist_noinst_DATA += xulapp/components/gom/public/xgIGObjectWrapper.idl
+
+dist_noinst_DATA += xulapp/components/gom/src/Makefile.in
+dist_noinst_DATA += xulapp/components/gom/src/xgGomElementFactory.cpp
+dist_noinst_DATA += xulapp/components/gom/src/xgGomElementFactory.h
+dist_noinst_DATA += xulapp/components/gom/src/xgGomModule.cpp
+dist_noinst_DATA += xulapp/components/gom/src/xgGtkElement.cpp
+dist_noinst_DATA += xulapp/components/gom/src/xgGtkElement.h
+dist_noinst_DATA += xulapp/components/gom/src/xgGtkElementFactory.cpp
+dist_noinst_DATA += xulapp/components/gom/src/xgGtkElementFactory.h
+dist_noinst_DATA += xulapp/components/gom/src/xgScriptElement.cpp
+dist_noinst_DATA += xulapp/components/gom/src/xgScriptElement.h
+dist_noinst_DATA += xulapp/components/gom/src/xgString.h

Added: trunk/gom/xulapp/configure-mozilla
==============================================================================
--- (empty file)
+++ trunk/gom/xulapp/configure-mozilla Tue Aug 26 00:19:28 2008
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+MOZILLA=$1
+top_srcdir=$2
+top_builddir=$PWD
+if [ -z "$MOZILLA" -o -z "$top_srcdir" ] ; then
+ echo >&2 "Usage: ${0##*/} <mozilla dir> <top_srcdir>"
+ exit 1
+fi
+
+set -x
+
+rm -f $MOZILLA/gom
+ln -s $top_builddir/$top_srcdir/xulapp $MOZILLA/gom
+mkdir -p mozilla.obj
+cd mozilla.obj
+MOZCONFIG=$PWD/../xulapp/mozconfig CPPFLAGS="$CPPFLAGS
-I$top_builddir/$top_srcdir/include -I$top_builddir/include"
$MOZILLA/configure

Reply all

Reply to author

Forward

0 new messages