Skip to content
Browse files

[BUG #6263] some file movements; adapted Makefile.release for 'storag…

…e' and 'server' comps

- moved tool/data/publish/index.html to tool/admin/release
- moved tool/data/publish/needs_generation.js to tool/data/generator
  resolving tool/data/publish
  • Loading branch information...
1 parent df2f52e commit c55da4d35493b696b8918ea31acf7b789e3d2761 @thron7 thron7 committed Mar 27, 2012
View
78 tool/admin/release/Makefile.release
@@ -76,8 +76,9 @@ RELEASE_BUILD = release/temp/build/qooxdoo-$(FRAMEWORK_VERSION)-build
RELEASE_SDK = release/temp/sdk/qooxdoo-$(FRAMEWORK_VERSION)-sdk
APPLICATIONS = todo feedreader portal mobileshowcase playground showcase widgetbrowser featureconfigeditor demobrowser
-COMPONENTS = apiviewer testrunner inspector storage
-FRAMEWORK_TARGETS = api test qxoo-build qxoo-noopt
+#APPLICATIONS = todo feedreader portal mobileshowcase playground showcase widgetbrowser featureconfigeditor
+COMPONENTS = apiviewer testrunner inspector storage server
+FRAMEWORK_TARGETS = api test
################################################################################
@@ -121,9 +122,9 @@ release-sdk-svn-collect:
@for APPLICATION in $(APPLICATIONS); do \
$(CMD_MKDIR) $(RELEASE_SDK)/application/$$APPLICATION/source/script; \
if [ "$$APPLICATION" = "widgetbrowser" ]; then \
- $(CMD_SYNC_OFFLINE) ./tool/data/publish/needs_generation.js $(RELEASE_SDK)/application/$$APPLICATION/source/script/$$APPLICATION.modern.js; \
+ $(CMD_SYNC_OFFLINE) ./tool/data/generator/needs_generation.js $(RELEASE_SDK)/application/$$APPLICATION/source/script/$$APPLICATION.modern.js; \
else \
- $(CMD_SYNC_OFFLINE) ./tool/data/publish/needs_generation.js $(RELEASE_SDK)/application/$$APPLICATION/source/script/$$APPLICATION.js; \
+ $(CMD_SYNC_OFFLINE) ./tool/data/generator/needs_generation.js $(RELEASE_SDK)/application/$$APPLICATION/source/script/$$APPLICATION.js; \
fi; \
done
@$(CMD_SYNC_OFFLINE) application/showcase/build/* $(RELEASE_SDK)/application/showcase/build
@@ -290,11 +291,11 @@ build-apps:
done
build-components:
- @time for APPLICATION in $(COMPONENTS); do \
- ( cd component/$$APPLICATION && $(CMD_GENERATOR) build ) || exit 1; \
- if [ "$$APPLICATION" = "storage" ]; then \
- ( cd component/$$APPLICATION && $(CMD_GENERATOR) build-require ) || exit 1; \
- elif [ "$$APPLICATION" = "testrunner" ]; then \
+ @time for COMPONENT in $(COMPONENTS); do \
+ ( cd component/$$COMPONENT && $(CMD_GENERATOR) build ) || exit 1; \
+ if [ "$$COMPONENT" = "storage" ]; then \
+ ( cd component/standalone/$$COMPONENT && $(CMD_GENERATOR) build-require ) || exit 1; \
+ elif [ "$$COMPONENT" = "testrunner" ]; then \
( cd component/testrunner && $(CMD_GENERATOR) -c portable.json build ) || exit 1; \
fi; \
done
@@ -344,7 +345,9 @@ publish-docs:
check-docs: check-docs-html check-docs-pdf
check-docs-html:
- @for TARGET in `echo "index.html pages/core.html pages/development.html pages/gui_toolkit.html"`; do F="documentation/manual/build/html/$$TARGET"; [ -s $$F ] || ( echo "Missing $$F; run 'make publish-build' first!"; exit 1 ); done
+ @for TARGET in `echo "index.html pages/core.html pages/development.html pages/desktop.html"`; do \
+ F="documentation/manual/build/html/$$TARGET"; [ -s $$F ] || ( echo "Missing $$F; run 'make publish-build' first!"; exit 1 ); \
+ done
check-docs-pdf:
@F="documentation/manual/build/latex/qooxdoo.pdf"; [ -s $$F ] || ( echo "Missing $$F; run 'make publish-build' first!"; exit 1 );
@@ -359,8 +362,8 @@ publish-build-components:
@( cd component/inspector && $(CMD_GENERATOR) build ) || exit 1
@( cd component/testrunner && $(CMD_GENERATOR) build ) || exit 1
@( cd component/testrunner && $(CMD_GENERATOR) -c portable.json build ) || exit 1;
- @( cd component/storage && $(CMD_GENERATOR) build ) || exit 1
- @( cd component/storage && $(CMD_GENERATOR) build-require ) || exit 1
+ @( cd component/standalone/storage && $(CMD_GENERATOR) build ) || exit 1
+ @( cd component/standalone/storage && $(CMD_GENERATOR) build-require ) || exit 1
publish-check: check-banner check-apps check-components check-framework check-docs
@echo " - Looks good"
@@ -389,28 +392,27 @@ check-components:
F="component/testrunner/build/script/$$TARGET-portable.js"; \
[ -s $$F ] || ( echo "Missing $$F; run 'make publish-build' first!"; exit 1 ); \
elif [ "$$TARGET" = "storage" ]; then \
- F="component/$$TARGET/$$TARGET.js"; \
+ F="component/standalone/$$TARGET/script/$$TARGET.js"; \
+ [ -s $$F ] || ( echo "Missing $$F; run 'make publish-build' first!"; exit 1 ); \
+ F="component/standalone/$$TARGET/script/$$TARGET-require.js"; \
[ -s $$F ] || ( echo "Missing $$F; run 'make publish-build' first!"; exit 1 ); \
- F="component/$$TARGET/$$TARGET-require.js"; \
+ elif [ "$$TARGET" = "server" ]; then \
+ F="component/standalone/$$TARGET/script/qx-oo.js"; \
+ [ -s $$F ] || ( echo "Missing $$F; run 'make publish-build' first!"; exit 1 ); \
+ F="component/standalone/$$TARGET/script/qx-oo-noopt.js"; \
[ -s $$F ] || ( echo "Missing $$F; run 'make publish-build' first!"; exit 1 ); \
fi; \
done
check-framework:
@for TARGET in $(FRAMEWORK_TARGETS); do \
- if [ "$$TARGET" = "qxoo-build" ]; then \
- F="framework/build/script/qx-oo.js"; [ -s $$F ] || ( echo "Missing $$F; run 'make publish-build' first!"; exit 1 ); \
- elif [ "$$TARGET" = "qxoo-noopt" ]; then \
- F="framework/build/script/qx-oo-noopt.js"; [ -s $$F ] || ( echo "Missing $$F; run 'make publish-build' first!"; exit 1 ); \
- else \
- F="framework/$$TARGET/script"; [ -d $$F ] || ( echo "Missing $$F; run 'make publish-build' first!"; exit 1 ); \
- fi; \
+ F="framework/$$TARGET/script"; [ -d $$F ] || ( echo "Missing $$F; run 'make publish-build' first!"; exit 1 ); \
done
publish-index:
@echo " * Preparing index.html..."
@$(CMD_MKDIR) temp/
- @cat tool/data/publish/index.html | \
+ @cat tool/admin/release/index.html | \
sed 's/class="local"/class="local hide"/g' | \
sed 's/ class="publish"//g' > temp/index.html
@echo " * Syncing index.html..."
@@ -443,25 +445,22 @@ publish-apps:
if [ "$$APPLICATION" = "test" ]; then \
$(CMD_SYNC_ONLINE) framework/$$APPLICATION/* $(STAGING_HOST):/var/www/qooxdoo/demo/$(FRAMEWORK_VERSION)/testrunner || exit 1; \
fi; \
- if [ "$$APPLICATION" = "qxoo-build" ]; then \
- $(CMD_SYNC_ONLINE) framework/build/script/qx-oo.js $(STAGING_HOST):/var/www/qooxdoo/demo/$(FRAMEWORK_VERSION)/framework || exit 1; \
- fi; \
- if [ "$$APPLICATION" = "qxoo-noopt" ]; then \
- $(CMD_SYNC_ONLINE) framework/build/script/qx-oo-noopt.js $(STAGING_HOST):/var/www/qooxdoo/demo/$(FRAMEWORK_VERSION)/framework || exit 1; \
- fi; \
done
@echo " * Syncing components..."
- @for APPLICATION in $(COMPONENTS); do \
- if [ "$$APPLICATION" = "inspector" ]; then \
- echo " - $$APPLICATION..."; \
- $(CMD_SYNC_ONLINE) component/$$APPLICATION/build/* $(STAGING_HOST):/var/www/qooxdoo/demo/$(FRAMEWORK_VERSION)/$$APPLICATION || exit 1; \
- elif [ "$$APPLICATION" = "testrunner" ]; then \
- echo " - $$APPLICATION..."; \
- $(CMD_SYNC_ONLINE) component/testrunner/build/script/$$APPLICATION-portable.js $(STAGING_HOST):/var/www/qooxdoo/demo/$(FRAMEWORK_VERSION)/$$APPLICATION/script/$$APPLICATION-portable.js || exit 1; \
- elif [ "$$APPLICATION" = "storage" ]; then \
- echo " - $$APPLICATION..."; \
- $(CMD_SYNC_ONLINE) component/storage/$$APPLICATION.js $(STAGING_HOST):/var/www/qooxdoo/demo/$(FRAMEWORK_VERSION)/framework || exit 1; \
- $(CMD_SYNC_ONLINE) component/storage/$$APPLICATION-require.js $(STAGING_HOST):/var/www/qooxdoo/demo/$(FRAMEWORK_VERSION)/framework || exit 1; \
+ @for COMPONENT in $(COMPONENTS); do \
+ if [ "$$COMPONENT" = "inspector" ]; then \
+ echo " - $$COMPONENT..."; \
+ $(CMD_SYNC_ONLINE) component/$$COMPONENT/build/* $(STAGING_HOST):/var/www/qooxdoo/demo/$(FRAMEWORK_VERSION)/$$COMPONENT || exit 1; \
+ elif [ "$$COMPONENT" = "testrunner" ]; then \
+ echo " - $$COMPONENT..."; \
+ $(CMD_SYNC_ONLINE) component/testrunner/build/script/$$COMPONENT-portable.js $(STAGING_HOST):/var/www/qooxdoo/demo/$(FRAMEWORK_VERSION)/$$COMPONENT/script/$$COMPONENT-portable.js || exit 1; \
+ elif [ "$$COMPONENT" = "storage" ]; then \
+ echo " - $$COMPONENT..."; \
+ $(CMD_SYNC_ONLINE) component/standalone/$$COMPONENT/script/$$COMPONENT.js $(STAGING_HOST):/var/www/qooxdoo/demo/$(FRAMEWORK_VERSION)/framework || exit 1; \
+ $(CMD_SYNC_ONLINE) component/standalone/$$COMPONENT/script/$$COMPONENT-require.js $(STAGING_HOST):/var/www/qooxdoo/demo/$(FRAMEWORK_VERSION)/framework || exit 1; \
+ elif [ "$$COMPONENT" = "server" ]; then \
+ $(CMD_SYNC_ONLINE) component/standalone/$$COMPONENT/script/qx-oo.js $(STAGING_HOST):/var/www/qooxdoo/demo/$(FRAMEWORK_VERSION)/framework || exit 1; \
+ $(CMD_SYNC_ONLINE) component/standalone/$$COMPONENT/script/qx-oo-noopt.js $(STAGING_HOST):/var/www/qooxdoo/demo/$(FRAMEWORK_VERSION)/framework || exit 1; \
fi; \
done
@@ -474,6 +473,7 @@ publish-backup:
@ssh $(STAGING_HOST) "$(CMD_SYNC_BACKUP) /var/www/qooxdoo/demo/devel /var/www/qooxdoo/demo/0.0.devel_backlog/"
publish-staging: publish-check publish-backup publish-index publish-apps publish-docs
+#publish-staging: publish-check publish-index publish-apps publish-docs
publish: publish-staging publish-production
View
0 tool/data/publish/index.html → tool/admin/release/index.html
File renamed without changes.
View
0 tool/data/publish/needs_generation.js → tool/data/generator/needs_generation.js
File renamed without changes.

0 comments on commit c55da4d

Please sign in to comment.
Something went wrong with that request. Please try again.