summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac10
-rwxr-xr-xrun.sh.in2
-rw-r--r--services/Makefile.am4
-rw-r--r--services/python/Makefile.am5
-rw-r--r--web-gui/Makefile.am3
-rw-r--r--web-gui/calculator/Makefile.am25
-rw-r--r--web-gui/calculator/config.json.in3
-rwxr-xr-xweb-gui/calculator/generate.py.in (renamed from web-gui/calculator/generate.py)2
-rw-r--r--web-gui/calculator/readme.txt10
-rw-r--r--web-gui/hello-world/Makefile.am24
-rw-r--r--web-gui/hello-world/config.json.in3
-rwxr-xr-xweb-gui/hello-world/generate.py.in (renamed from web-gui/hello-world/generate.py)2
-rw-r--r--web-gui/hello-world/readme.txt10
14 files changed, 77 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am
index f61566d..fd8f9d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,12 @@
+DISTCHECK_CONFIGURE_FLAGS = --with-qooxdoo-sdk=@QOOXDOO_SDK@
+
SUBDIRS = \
- web-gui
+ web-gui \
+ services
+
+CLEANFILES = \
+ lighttpd/error.log
MAINTAINERCLEANFILES = \
Makefile.in
diff --git a/configure.ac b/configure.ac
index a9b0def..f85fab5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,16 +18,18 @@ if test "x$HAVE_PYTHON" != "xyes"; then
AC_MSG_ERROR([Python not found.])
fi
-AC_PATH_PROGS([LIGHTTPD],[lighttpd],,)
+AC_PATH_PROG([LIGHTTPD],[lighttpd],,)
if test -z "$LIGHTTPD"; then
AC_MSG_ERROR([lighttpd not found. Define LIGHTTPD=/path/to/lighttpd or make sure lighttpd is in \$PATH])
fi
+AC_ARG_VAR([LIGHTTPD], [lighttpd web server])
AC_SUBST(LIGHTTPD)
-AC_PATH_PROGS([JSON_DBUS_BRIDGE],[json-dbus-bridge],,)
+AC_PATH_PROG([JSON_DBUS_BRIDGE],[json-dbus-bridge],,)
if test -z "$JSON_DBUS_BRIDGE"; then
AC_MSG_ERROR([json-dbus-bridge not found. Set JSON_DBUS_BRIDGE=/path/to/json-dbus-bridge or make sure json-dbus-bridge is in \$PATH])
fi
+AC_ARG_VAR([JSON_DBUS_BRIDGE], [json-dbus-bridge FCGI application])
AC_SUBST(JSON_DBUS_BRIDGE)
AC_ARG_WITH([qooxdoo-sdk],AS_HELP_STRING([--with-qooxdoo-sdk=PATH], [Path to qooxdoo sdk]),
@@ -45,6 +47,8 @@ AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2])
AC_CONFIG_FILES([
Makefile
lighttpd/lighttpd.conf
+ services/Makefile
+ services/python/Makefile
web-gui/Makefile
web-gui/hello-world/Makefile
web-gui/hello-world/config.json
@@ -52,6 +56,8 @@ AC_CONFIG_FILES([
web-gui/calculator/config.json
])
AC_CONFIG_FILES([run.sh],[chmod +x run.sh])
+AC_CONFIG_FILES([web-gui/hello-world/generate.py],[chmod +x web-gui/hello-world/generate.py])
+AC_CONFIG_FILES([web-gui/calculator/generate.py],[chmod +x web-gui/calculator/generate.py])
AC_OUTPUT
diff --git a/run.sh.in b/run.sh.in
index acd7d41..95d846a 100755
--- a/run.sh.in
+++ b/run.sh.in
@@ -30,7 +30,7 @@ echo -n "waiting for lighttpd "
for i in `seq 10`; do
sleep 1
echo -n "."
- wget -e no_proxy=localhost -O - -q http://localhost:8080/hello-world/source/ > /dev/null && break
+ wget -e no_proxy=localhost -O - -q http://localhost:8080/hello-world/build/ > /dev/null && break
done
if [ $? -ne 0 ]; then
diff --git a/services/Makefile.am b/services/Makefile.am
new file mode 100644
index 0000000..3d8b377
--- /dev/null
+++ b/services/Makefile.am
@@ -0,0 +1,4 @@
+
+SUBDIRS = \
+ python
+
diff --git a/services/python/Makefile.am b/services/python/Makefile.am
new file mode 100644
index 0000000..0b976e4
--- /dev/null
+++ b/services/python/Makefile.am
@@ -0,0 +1,5 @@
+
+EXTRA_DIST = \
+ calculator.py \
+ hello-world.py
+
diff --git a/web-gui/Makefile.am b/web-gui/Makefile.am
index 4ca8f21..e0304e9 100644
--- a/web-gui/Makefile.am
+++ b/web-gui/Makefile.am
@@ -3,6 +3,9 @@ SUBDIRS = \
hello-world \
calculator
+clean-local:
+ rm -rf qooxdoo-cache
+
MAINTAINERCLEANFILES = \
Makefile.in
diff --git a/web-gui/calculator/Makefile.am b/web-gui/calculator/Makefile.am
index af29dd7..92e5608 100644
--- a/web-gui/calculator/Makefile.am
+++ b/web-gui/calculator/Makefile.am
@@ -1,10 +1,29 @@
+QOOXDOO_SOURCE = \
+ Manifest.json \
+ generate.py \
+ source/resource/calculator/back.png \
+ source/script/calculator.js \
+ source/index.html \
+ source/translation/readme.txt \
+ source/class/calculator/Application.js \
+ source/class/calculator/test/DemoTest.js \
+ source/class/calculator/theme/Color.js \
+ source/class/calculator/theme/Theme.js \
+ source/class/calculator/theme/Decoration.js \
+ source/class/calculator/theme/Font.js \
+ source/class/calculator/theme/Appearance.js
+
all:
- if [ "@srcdir@" != "@builddir@" ]; then \
- cp -a "@srcdir@/"{source,generate.py,Manifest.json} "@builddir@/"; \
- fi
./generate.py build
+clean-local:
+ rm -rf build
+
+EXTRA_DIST = \
+ config.json.in \
+ $(QOOXDOO_SOURCE)
+
MAINTAINERCLEANFILES = \
Makefile.in
diff --git a/web-gui/calculator/config.json.in b/web-gui/calculator/config.json.in
index 73bc087..93c33c7 100644
--- a/web-gui/calculator/config.json.in
+++ b/web-gui/calculator/config.json.in
@@ -36,7 +36,8 @@
"API_EXCLUDE" : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*"],
"LOCALES" : [ "en" ],
"CACHE" : "@abs_builddir@/../qooxdoo-cache",
- "ROOT" : "."
+ "BUILD_PATH" : "@abs_builddir@/build",
+ "ROOT" : "@abs_srcdir@"
}
// You only need to edit the remainder of this file, if you want to customize
diff --git a/web-gui/calculator/generate.py b/web-gui/calculator/generate.py.in
index 2d7794d..2e1f102 100755
--- a/web-gui/calculator/generate.py
+++ b/web-gui/calculator/generate.py.in
@@ -25,7 +25,7 @@
import sys, os, re, subprocess
CMD_PYTHON = 'python'
-QOOXDOO_PATH = '../../../../src/qooxdoo-1.1-sdk'
+QOOXDOO_PATH = '@QOOXDOO_SDK@'
def getQxPath():
path = QOOXDOO_PATH
diff --git a/web-gui/calculator/readme.txt b/web-gui/calculator/readme.txt
deleted file mode 100644
index a7b3d84..0000000
--- a/web-gui/calculator/readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-GUI Skeleton - A qooxdoo Application Template
-=============================================
-
-This is a qooxdoo application skeleton which is used as a template. The
-'create-application.py' script (usually under tool/bin/create-application.py)
-will use this and expand it into a self-contained qooxdoo application which
-can then be further extended. Please refer to the script and other documentation
-for further information.
-
-short:: is a standard qooxdoo GUI application \ No newline at end of file
diff --git a/web-gui/hello-world/Makefile.am b/web-gui/hello-world/Makefile.am
index af29dd7..2f3d390 100644
--- a/web-gui/hello-world/Makefile.am
+++ b/web-gui/hello-world/Makefile.am
@@ -1,10 +1,28 @@
+QOOXDOO_SOURCE = \
+ Manifest.json \
+ generate.py \
+ source/resource/hello_world/back.png \
+ source/index.html \
+ source/translation/readme.txt \
+ source/class/hello_world/Application.js \
+ source/class/hello_world/test/DemoTest.js \
+ source/class/hello_world/theme/Color.js \
+ source/class/hello_world/theme/Theme.js \
+ source/class/hello_world/theme/Decoration.js \
+ source/class/hello_world/theme/Font.js \
+ source/class/hello_world/theme/Appearance.js
+
all:
- if [ "@srcdir@" != "@builddir@" ]; then \
- cp -a "@srcdir@/"{source,generate.py,Manifest.json} "@builddir@/"; \
- fi
./generate.py build
+clean-local:
+ rm -rf build
+
+EXTRA_DIST = \
+ config.json.in \
+ $(QOOXDOO_SOURCE)
+
MAINTAINERCLEANFILES = \
Makefile.in
diff --git a/web-gui/hello-world/config.json.in b/web-gui/hello-world/config.json.in
index 0952a8f..82e59af 100644
--- a/web-gui/hello-world/config.json.in
+++ b/web-gui/hello-world/config.json.in
@@ -36,7 +36,8 @@
"API_EXCLUDE" : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*"],
"LOCALES" : [ "en" ],
"CACHE" : "@abs_builddir@/../qooxdoo-cache",
- "ROOT" : "."
+ "BUILD_PATH" : "@abs_builddir@/build",
+ "ROOT" : "@abs_srcdir@"
}
// You only need to edit the remainder of this file, if you want to customize
diff --git a/web-gui/hello-world/generate.py b/web-gui/hello-world/generate.py.in
index 2d7794d..2e1f102 100755
--- a/web-gui/hello-world/generate.py
+++ b/web-gui/hello-world/generate.py.in
@@ -25,7 +25,7 @@
import sys, os, re, subprocess
CMD_PYTHON = 'python'
-QOOXDOO_PATH = '../../../../src/qooxdoo-1.1-sdk'
+QOOXDOO_PATH = '@QOOXDOO_SDK@'
def getQxPath():
path = QOOXDOO_PATH
diff --git a/web-gui/hello-world/readme.txt b/web-gui/hello-world/readme.txt
deleted file mode 100644
index a7b3d84..0000000
--- a/web-gui/hello-world/readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-GUI Skeleton - A qooxdoo Application Template
-=============================================
-
-This is a qooxdoo application skeleton which is used as a template. The
-'create-application.py' script (usually under tool/bin/create-application.py)
-will use this and expand it into a self-contained qooxdoo application which
-can then be further extended. Please refer to the script and other documentation
-for further information.
-
-short:: is a standard qooxdoo GUI application \ No newline at end of file