From 8777b26e0aa8f3f970b9fdc18395edad7656f169 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 17 Apr 2010 09:31:20 -0400 Subject: [PATCH 01/24] adding the hello world mxml app as a submodule --- .gitmodules | 3 +++ HelloWorld | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 HelloWorld diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..8772361 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "HelloWorld"] + path = HelloWorld + url = git://github.com/AdamAtomic/HelloWorld.git diff --git a/HelloWorld b/HelloWorld new file mode 160000 index 0000000..383388c --- /dev/null +++ b/HelloWorld @@ -0,0 +1 @@ +Subproject commit 383388c9282054269e90d007461bd90c2ca6d35b From e500a643ed1221b98debcc10bf333c0fbbdb7f0c Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 17 Apr 2010 15:21:31 -0400 Subject: [PATCH 02/24] gotten build working, but missing symbols (???) --- .gitmodules | 3 +++ HelloWorld | 2 +- Makefile | 11 +++++++++++ flixel | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Makefile create mode 160000 flixel diff --git a/.gitmodules b/.gitmodules index 8772361..1407f72 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "HelloWorld"] path = HelloWorld url = git://github.com/AdamAtomic/HelloWorld.git +[submodule "flixel"] + path = flixel + url = git@github.com:meatballhat/flixel.git diff --git a/HelloWorld b/HelloWorld index 383388c..332616e 160000 --- a/HelloWorld +++ b/HelloWorld @@ -1 +1 @@ -Subproject commit 383388c9282054269e90d007461bd90c2ca6d35b +Subproject commit 332616e645c26753a137eaf36d921e6fcff77a74 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..dc8588b --- /dev/null +++ b/Makefile @@ -0,0 +1,11 @@ +FLIXEL := $(PWD)/flixel + +MXMLC := mxmlc +MXMLC_FLAGS := -sp $(FLIXEL) + +all: + cd HelloWorld/src && $(MAKE) + + +.PHONY: all +.EXPORT_ALL_VARIABLES: diff --git a/flixel b/flixel new file mode 160000 index 0000000..c2cf2b7 --- /dev/null +++ b/flixel @@ -0,0 +1 @@ +Subproject commit c2cf2b705436ca2119b6e78646c4ec68935cf061 From 085b5659c760bd2fc967b949f0b14301c7a40a72 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 17 Apr 2010 15:24:38 -0400 Subject: [PATCH 03/24] updating HelloWorld submodule --- HelloWorld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HelloWorld b/HelloWorld index 332616e..c8744ad 160000 --- a/HelloWorld +++ b/HelloWorld @@ -1 +1 @@ -Subproject commit 332616e645c26753a137eaf36d921e6fcff77a74 +Subproject commit c8744ad02d4c9e97f2978e727368f858d37df786 From 504b1d1ed1906aa12eade26bed29478b7628cd5d Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 17 Apr 2010 20:01:16 -0400 Subject: [PATCH 04/24] switching HelloWorld submodule to mine --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 1407f72..55f9ee6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "HelloWorld"] path = HelloWorld - url = git://github.com/AdamAtomic/HelloWorld.git + url = git@github.com:meatballhat/HelloWorld.git [submodule "flixel"] path = flixel url = git@github.com:meatballhat/flixel.git From 53dbfa4f648fca3a7872a10a77954c9b609a46dd Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 17 Apr 2010 21:38:00 -0400 Subject: [PATCH 05/24] adding Flx-Invaders submodule, adding project to top-level Makefile --- .gitmodules | 3 +++ Flx-Invaders | 1 + Makefile | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 160000 Flx-Invaders diff --git a/.gitmodules b/.gitmodules index 55f9ee6..a8155bf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "flixel"] path = flixel url = git@github.com:meatballhat/flixel.git +[submodule "Flx-Invaders"] + path = Flx-Invaders + url = git@github.com:meatballhat/Flx-Invaders.git diff --git a/Flx-Invaders b/Flx-Invaders new file mode 160000 index 0000000..821fb61 --- /dev/null +++ b/Flx-Invaders @@ -0,0 +1 @@ +Subproject commit 821fb61d02c6e229d7b8e72ec64200b96ca5de13 diff --git a/Makefile b/Makefile index dc8588b..367f198 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,8 @@ MXMLC := mxmlc MXMLC_FLAGS := -sp $(FLIXEL) all: - cd HelloWorld/src && $(MAKE) + @(cd HelloWorld/src && $(MAKE)) + @(cd Flx-Invaders/src && $(MAKE)) .PHONY: all From df32d2cc2e11f7cd3402a91e95a45adc49d5298b Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 17 Apr 2010 21:38:53 -0400 Subject: [PATCH 06/24] updating ref for Flx-Invaders --- Flx-Invaders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flx-Invaders b/Flx-Invaders index 821fb61..3a846ce 160000 --- a/Flx-Invaders +++ b/Flx-Invaders @@ -1 +1 @@ -Subproject commit 821fb61d02c6e229d7b8e72ec64200b96ca5de13 +Subproject commit 3a846ce1fef29a46e5bafe3c68d72ca10d72faae From b1bd359a632399bcca3a96abdcf38b99cfe76214 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sun, 18 Apr 2010 08:22:39 -0400 Subject: [PATCH 07/24] adding FlxCollisions submodule --- .gitmodules | 3 +++ FlxCollisions | 1 + Makefile | 1 + 3 files changed, 5 insertions(+) create mode 160000 FlxCollisions diff --git a/.gitmodules b/.gitmodules index a8155bf..0fe8e4a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "Flx-Invaders"] path = Flx-Invaders url = git@github.com:meatballhat/Flx-Invaders.git +[submodule "FlxCollisions"] + path = FlxCollisions + url = git@github.com:meatballhat/FlxCollisions.git diff --git a/FlxCollisions b/FlxCollisions new file mode 160000 index 0000000..6864ece --- /dev/null +++ b/FlxCollisions @@ -0,0 +1 @@ +Subproject commit 6864eceee470fbc12d01620a01f46be7a165457f diff --git a/Makefile b/Makefile index 367f198..5a85669 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ MXMLC_FLAGS := -sp $(FLIXEL) all: @(cd HelloWorld/src && $(MAKE)) @(cd Flx-Invaders/src && $(MAKE)) + @(cd FlxCollisions/src && $(MAKE)) .PHONY: all From 253563e9a6f88112fde9ecc01cf28a547c500873 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sun, 18 Apr 2010 15:04:11 -0400 Subject: [PATCH 08/24] adding FlxTeroids submodule --- .gitmodules | 3 +++ FlxTeroids | 1 + Makefile | 1 + 3 files changed, 5 insertions(+) create mode 160000 FlxTeroids diff --git a/.gitmodules b/.gitmodules index 0fe8e4a..e9bce28 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "FlxCollisions"] path = FlxCollisions url = git@github.com:meatballhat/FlxCollisions.git +[submodule "FlxTeroids"] + path = FlxTeroids + url = git@github.com:meatballhat/FlxTeroids.git diff --git a/FlxTeroids b/FlxTeroids new file mode 160000 index 0000000..18f31fc --- /dev/null +++ b/FlxTeroids @@ -0,0 +1 @@ +Subproject commit 18f31fccb65ea254305a7a2b99df3a4a35489eaf diff --git a/Makefile b/Makefile index 5a85669..192e6c3 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ all: @(cd HelloWorld/src && $(MAKE)) @(cd Flx-Invaders/src && $(MAKE)) @(cd FlxCollisions/src && $(MAKE)) + @(cd FlxTeroids/src && $(MAKE)) .PHONY: all From 38f76f7ba72d05a3e9d7145000f6260ed3ce3462 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sun, 18 Apr 2010 15:08:23 -0400 Subject: [PATCH 09/24] adding FlxBlur submodule --- .gitmodules | 3 +++ FlxBlur | 1 + Makefile | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 160000 FlxBlur diff --git a/.gitmodules b/.gitmodules index e9bce28..c6691a5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "FlxTeroids"] path = FlxTeroids url = git@github.com:meatballhat/FlxTeroids.git +[submodule "FlxBlur"] + path = FlxBlur + url = git@github.com:meatballhat/FlxBlur.git diff --git a/FlxBlur b/FlxBlur new file mode 160000 index 0000000..5d3bc8c --- /dev/null +++ b/FlxBlur @@ -0,0 +1 @@ +Subproject commit 5d3bc8cbe0cbe221a7990c580711c10ebd043d77 diff --git a/Makefile b/Makefile index 192e6c3..dcd5311 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,11 @@ MXMLC := mxmlc MXMLC_FLAGS := -sp $(FLIXEL) all: - @(cd HelloWorld/src && $(MAKE)) @(cd Flx-Invaders/src && $(MAKE)) + @(cd FlxBlur/src && $(MAKE)) @(cd FlxCollisions/src && $(MAKE)) @(cd FlxTeroids/src && $(MAKE)) + @(cd HelloWorld/src && $(MAKE)) .PHONY: all From 037e33b84e69e25ff46457193cc226de4dd0e6ad Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sun, 18 Apr 2010 15:14:34 -0400 Subject: [PATCH 10/24] adding FlxBloom submodule --- .gitmodules | 3 +++ FlxBloom | 1 + Makefile | 18 +++++++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-) create mode 160000 FlxBloom diff --git a/.gitmodules b/.gitmodules index c6691a5..dcc10f5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "FlxBlur"] path = FlxBlur url = git@github.com:meatballhat/FlxBlur.git +[submodule "FlxBloom"] + path = FlxBloom + url = git@github.com:meatballhat/FlxBloom.git diff --git a/FlxBloom b/FlxBloom new file mode 160000 index 0000000..3c6eb44 --- /dev/null +++ b/FlxBloom @@ -0,0 +1 @@ +Subproject commit 3c6eb4461ddeabdaae679355999fd3a8cde6659e diff --git a/Makefile b/Makefile index dcd5311..5cc86b9 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,22 @@ FLIXEL := $(PWD)/flixel +TOP := $(PWD) MXMLC := mxmlc MXMLC_FLAGS := -sp $(FLIXEL) +PROJECTS = \ + Flx-Invaders \ + FlxBloom \ + FlxBlur \ + FlxCollisions \ + FlxTeroids \ + HelloWorld + +mkproject = cd $(project)/src && $(MAKE) && cd $(TOP) ; + + all: - @(cd Flx-Invaders/src && $(MAKE)) - @(cd FlxBlur/src && $(MAKE)) - @(cd FlxCollisions/src && $(MAKE)) - @(cd FlxTeroids/src && $(MAKE)) - @(cd HelloWorld/src && $(MAKE)) + $(foreach project,$(PROJECTS),$(mkproject)) .PHONY: all From 365cb8f87f11bc60067a61ba928ead2ac3277552 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 19 Apr 2010 19:04:46 -0400 Subject: [PATCH 11/24] first pass at html wrapper generator script --- Makefile | 1 + bin/flashhtml.py | 969 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 970 insertions(+) create mode 100755 bin/flashhtml.py diff --git a/Makefile b/Makefile index 5cc86b9..df319c3 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ FLIXEL := $(PWD)/flixel +WRAP := $(PWD)/bin/flashhtml.py TOP := $(PWD) MXMLC := mxmlc diff --git a/bin/flashhtml.py b/bin/flashhtml.py new file mode 100755 index 0000000..03e06d4 --- /dev/null +++ b/bin/flashhtml.py @@ -0,0 +1,969 @@ +#!/usr/bin/env python +from __future__ import print_function + +import sys +from string import Template + +import argparse + +OPTIONS = ( + (('-P', '--properties-file'), + dict(help='specify a properties file for use as variables ' + 'in html wrapper')), +) + + +def main(sysargs=sys.argv[:]): + parser = get_option_parser() + opts = parser.parse_args(sysargs[1:]) + + tmpl_vars = dict(VARS) + + if opts.properties_file: + _update_from_properties(tmpl_vars, opts.properties_file) + + print(TEMPLATE.substitute(**tmpl_vars)) + + return 0 + + +def get_option_parser(): + parser = argparse.ArgumentParser() + for args, kwargs in OPTIONS: + parser.add_argument(*args, **kwargs) + return parser + + +def _update_from_properties(tmpl_vars, properties_file): + defines = _get_defines_from_properties_file(properties_file) + tmpl_vars.update(defines) + + +def _get_defines_from_properties_file(properties_file): + ret = {} + + with open(properties_file) as opened: + + for line in opened: + line = line.strip() + + if line.startswith('#'): + continue + + if '=' in line: + key, value = line.split('=', 1) + ret[key] = value + + return ret + + +VARS = ( + ('title', ''), + ('bgcolor', ''), + ('useBrowserHistory', ''), + ('version_major', 0), + ('version_minor', 0), + ('version_revision', 0), + ('expressInstallSwf', ''), + ('application', ''), + ('swf', ''), + ('width', ''), + ('height', ''), +) +TEMPLATE = Template(""" + + + + + ${title} + + + + + + + + + + + +
+

+ To view this page ensure that Adobe Flash Player version + ${version_major}.${version_minor}.${version_revision} or greater is installed. +

+ +
+ + + + +""") + +if __name__ == '__main__': + sys.exit(main()) + +# vim:filetype=python From 6314580aab7d2c50bc93af28537292a9a0a94910 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 19 Apr 2010 19:53:30 -0400 Subject: [PATCH 12/24] finished doing html wrappers of all submodules --- .gitignore | 2 ++ .gitmodules | 4 ++-- Flx-Invaders => FlxInvaders | 0 Makefile | 25 ++++++++++++++++++++----- dist/FlxBloom.properties | 8 ++++++++ dist/FlxBlur.properties | 8 ++++++++ dist/FlxCollisions.properties | 8 ++++++++ dist/FlxInvaders.properties | 8 ++++++++ dist/FlxTeroids.properties | 8 ++++++++ dist/HelloWorld.properties | 8 ++++++++ bin/flashhtml.py => flash_html_wrap.py | 0 11 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 .gitignore rename Flx-Invaders => FlxInvaders (100%) create mode 100644 dist/FlxBloom.properties create mode 100644 dist/FlxBlur.properties create mode 100644 dist/FlxCollisions.properties create mode 100644 dist/FlxInvaders.properties create mode 100644 dist/FlxTeroids.properties create mode 100644 dist/HelloWorld.properties rename bin/flashhtml.py => flash_html_wrap.py (100%) mode change 100755 => 100644 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57b9c89 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +dist/*.swf +dist/*.html diff --git a/.gitmodules b/.gitmodules index dcc10f5..d066830 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ [submodule "flixel"] path = flixel url = git@github.com:meatballhat/flixel.git -[submodule "Flx-Invaders"] - path = Flx-Invaders +[submodule "FlxInvaders"] + path = FlxInvaders url = git@github.com:meatballhat/Flx-Invaders.git [submodule "FlxCollisions"] path = FlxCollisions diff --git a/Flx-Invaders b/FlxInvaders similarity index 100% rename from Flx-Invaders rename to FlxInvaders diff --git a/Makefile b/Makefile index df319c3..f777d00 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,38 @@ -FLIXEL := $(PWD)/flixel -WRAP := $(PWD)/bin/flashhtml.py TOP := $(PWD) +FLIXEL := $(TOP)/flixel +PYTHON := python2.6 +WRAP := $(TOP)/flash_html_wrap.py +DIST := $(TOP)/dist MXMLC := mxmlc MXMLC_FLAGS := -sp $(FLIXEL) PROJECTS = \ - Flx-Invaders \ + FlxInvaders \ FlxBloom \ FlxBlur \ FlxCollisions \ FlxTeroids \ HelloWorld -mkproject = cd $(project)/src && $(MAKE) && cd $(TOP) ; +mkproject = \ + cd $(project)/src && $(MAKE) && \ + cd $(TOP) && \ + $(call mkhtmlwrap,$(project)) && \ + cd $(TOP) ; + + +mkhtmlwrap = \ + cp $(TOP)/$(1)/src/$(1).swf $(DIST)/$(1).swf && \ + $(PYTHON) $(WRAP) -P $(DIST)/$(1).properties > $(DIST)/$(1).html + + +%.html: %.swf + $(call mkhtmlwrap,$*) all: - $(foreach project,$(PROJECTS),$(mkproject)) + $(foreach project,$(PROJECTS),$(mkproject)) echo "done" ; .PHONY: all diff --git a/dist/FlxBloom.properties b/dist/FlxBloom.properties new file mode 100644 index 0000000..a9c8f1f --- /dev/null +++ b/dist/FlxBloom.properties @@ -0,0 +1,8 @@ +title=Flixel Bloom +bgcolor=#000 +useBrowserHistory=false +expressInstallSwf=false +application=flixel-bloom-app +swf=FlxBloom +width=800 +height=600 diff --git a/dist/FlxBlur.properties b/dist/FlxBlur.properties new file mode 100644 index 0000000..00e959a --- /dev/null +++ b/dist/FlxBlur.properties @@ -0,0 +1,8 @@ +title=Flixel Blur +bgcolor=#000 +useBrowserHistory=false +expressInstallSwf=false +application=flixel-blur-app +swf=FlxBlur +width=800 +height=600 diff --git a/dist/FlxCollisions.properties b/dist/FlxCollisions.properties new file mode 100644 index 0000000..d67d683 --- /dev/null +++ b/dist/FlxCollisions.properties @@ -0,0 +1,8 @@ +title=Flixel Collisions +bgcolor=#000 +useBrowserHistory=false +expressInstallSwf=false +application=flixel-collisions-app +swf=FlxCollisions +width=800 +height=600 diff --git a/dist/FlxInvaders.properties b/dist/FlxInvaders.properties new file mode 100644 index 0000000..9661b3c --- /dev/null +++ b/dist/FlxInvaders.properties @@ -0,0 +1,8 @@ +title=Flixel Invaders +bgcolor=#000 +useBrowserHistory=false +expressInstallSwf=false +application=flixel-invaders-app +swf=FlxInvaders +width=800 +height=600 diff --git a/dist/FlxTeroids.properties b/dist/FlxTeroids.properties new file mode 100644 index 0000000..e828524 --- /dev/null +++ b/dist/FlxTeroids.properties @@ -0,0 +1,8 @@ +title=Flixel Teroids +bgcolor=#000 +useBrowserHistory=false +expressInstallSwf=false +application=flixel-teroids-app +swf=FlxTeroids +width=800 +height=600 diff --git a/dist/HelloWorld.properties b/dist/HelloWorld.properties new file mode 100644 index 0000000..b1f8086 --- /dev/null +++ b/dist/HelloWorld.properties @@ -0,0 +1,8 @@ +title=Hello World +bgcolor=#000 +useBrowserHistory=false +expressInstallSwf=false +application=hello-world-app +swf=HelloWorld +width=800 +height=600 diff --git a/bin/flashhtml.py b/flash_html_wrap.py old mode 100755 new mode 100644 similarity index 100% rename from bin/flashhtml.py rename to flash_html_wrap.py From a8b6720deaaadd97ace02e85c8f4a18a502c2756 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 19 Apr 2010 19:55:54 -0400 Subject: [PATCH 13/24] fixing implicit rule for html wrappers --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f777d00..a4d9de7 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ mkhtmlwrap = \ %.html: %.swf - $(call mkhtmlwrap,$*) + $(call mkhtmlwrap,$(*F)) all: From 34fbb4a469ae0eb87164fa237f83089af904491e Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 19 Apr 2010 20:00:58 -0400 Subject: [PATCH 14/24] majorly minimizing the html wrapper markup --- flash_html_wrap.py | 918 ++------------------------------------------- 1 file changed, 35 insertions(+), 883 deletions(-) diff --git a/flash_html_wrap.py b/flash_html_wrap.py index 03e06d4..489a554 100644 --- a/flash_html_wrap.py +++ b/flash_html_wrap.py @@ -73,893 +73,45 @@ VARS = ( TEMPLATE = Template(""" - ${title} - - - - - - - - - - -
-

- To view this page ensure that Adobe Flash Player version - ${version_major}.${version_minor}.${version_revision} or greater is installed. -

- -
- - - + + + + + + + + + + + + + + + + + + + + """) From cd9eb22b48ec772e2083d158286bdc0640083616 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 19 Apr 2010 20:03:11 -0400 Subject: [PATCH 15/24] more simplification of html wrapper stuff and associated properties files --- dist/FlxBloom.properties | 2 -- dist/FlxBlur.properties | 2 -- dist/FlxCollisions.properties | 2 -- dist/FlxInvaders.properties | 2 -- dist/FlxTeroids.properties | 2 -- dist/HelloWorld.properties | 2 -- flash_html_wrap.py | 5 ----- 7 files changed, 17 deletions(-) diff --git a/dist/FlxBloom.properties b/dist/FlxBloom.properties index a9c8f1f..a49daaa 100644 --- a/dist/FlxBloom.properties +++ b/dist/FlxBloom.properties @@ -1,7 +1,5 @@ title=Flixel Bloom bgcolor=#000 -useBrowserHistory=false -expressInstallSwf=false application=flixel-bloom-app swf=FlxBloom width=800 diff --git a/dist/FlxBlur.properties b/dist/FlxBlur.properties index 00e959a..49dec08 100644 --- a/dist/FlxBlur.properties +++ b/dist/FlxBlur.properties @@ -1,7 +1,5 @@ title=Flixel Blur bgcolor=#000 -useBrowserHistory=false -expressInstallSwf=false application=flixel-blur-app swf=FlxBlur width=800 diff --git a/dist/FlxCollisions.properties b/dist/FlxCollisions.properties index d67d683..5dfb183 100644 --- a/dist/FlxCollisions.properties +++ b/dist/FlxCollisions.properties @@ -1,7 +1,5 @@ title=Flixel Collisions bgcolor=#000 -useBrowserHistory=false -expressInstallSwf=false application=flixel-collisions-app swf=FlxCollisions width=800 diff --git a/dist/FlxInvaders.properties b/dist/FlxInvaders.properties index 9661b3c..f88fc4f 100644 --- a/dist/FlxInvaders.properties +++ b/dist/FlxInvaders.properties @@ -1,7 +1,5 @@ title=Flixel Invaders bgcolor=#000 -useBrowserHistory=false -expressInstallSwf=false application=flixel-invaders-app swf=FlxInvaders width=800 diff --git a/dist/FlxTeroids.properties b/dist/FlxTeroids.properties index e828524..a22ca39 100644 --- a/dist/FlxTeroids.properties +++ b/dist/FlxTeroids.properties @@ -1,7 +1,5 @@ title=Flixel Teroids bgcolor=#000 -useBrowserHistory=false -expressInstallSwf=false application=flixel-teroids-app swf=FlxTeroids width=800 diff --git a/dist/HelloWorld.properties b/dist/HelloWorld.properties index b1f8086..12d41ef 100644 --- a/dist/HelloWorld.properties +++ b/dist/HelloWorld.properties @@ -1,7 +1,5 @@ title=Hello World bgcolor=#000 -useBrowserHistory=false -expressInstallSwf=false application=hello-world-app swf=HelloWorld width=800 diff --git a/flash_html_wrap.py b/flash_html_wrap.py index 489a554..2b8110b 100644 --- a/flash_html_wrap.py +++ b/flash_html_wrap.py @@ -60,11 +60,6 @@ def _get_defines_from_properties_file(properties_file): VARS = ( ('title', ''), ('bgcolor', ''), - ('useBrowserHistory', ''), - ('version_major', 0), - ('version_minor', 0), - ('version_revision', 0), - ('expressInstallSwf', ''), ('application', ''), ('swf', ''), ('width', ''), From ca66661dc6f97edcb7aafb5af08609debab31d25 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 19 Apr 2010 20:18:26 -0400 Subject: [PATCH 16/24] adding Mode submodule --- .gitmodules | 3 +++ Makefile | 4 +++- Mode | 1 + dist/Mode.properties | 6 ++++++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 160000 Mode create mode 100644 dist/Mode.properties diff --git a/.gitmodules b/.gitmodules index d066830..5ea322b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "FlxBloom"] path = FlxBloom url = git@github.com:meatballhat/FlxBloom.git +[submodule "Mode"] + path = Mode + url = git@github.com:meatballhat/Mode.git diff --git a/Makefile b/Makefile index a4d9de7..768c041 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,9 @@ PROJECTS = \ FlxBlur \ FlxCollisions \ FlxTeroids \ - HelloWorld + HelloWorld \ + Mode + mkproject = \ cd $(project)/src && $(MAKE) && \ diff --git a/Mode b/Mode new file mode 160000 index 0000000..dbbf843 --- /dev/null +++ b/Mode @@ -0,0 +1 @@ +Subproject commit dbbf843472682d629df2402d5f2aef664d45e840 diff --git a/dist/Mode.properties b/dist/Mode.properties new file mode 100644 index 0000000..1b628ae --- /dev/null +++ b/dist/Mode.properties @@ -0,0 +1,6 @@ +title=Mode +bgcolor=#000 +application=mode-app +swf=Mode +width=800 +height=600 From 8da3b5fd42a3a66477b0b9c49fccb6e07e3cd9a7 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 19 Apr 2010 20:19:43 -0400 Subject: [PATCH 17/24] silencing the "all" target --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 768c041..ae42b0d 100644 --- a/Makefile +++ b/Makefile @@ -39,3 +39,4 @@ all: .PHONY: all .EXPORT_ALL_VARIABLES: +.SILENT: all From 1fd0ec66ef0977a9d95002662e8e032ae9aabb89 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 19 Apr 2010 20:31:34 -0400 Subject: [PATCH 18/24] updating ref for Mode --- Mode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mode b/Mode index dbbf843..edd4237 160000 --- a/Mode +++ b/Mode @@ -1 +1 @@ -Subproject commit dbbf843472682d629df2402d5f2aef664d45e840 +Subproject commit edd42374a83b481ddd2ac71a8a593eb869bd5d36 From 4b87a40a0e2350abcb9cbd175067271f60176824 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 19 Apr 2010 21:20:20 -0400 Subject: [PATCH 19/24] updating ref for Mode submodule --- Mode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mode b/Mode index edd4237..1abd28d 160000 --- a/Mode +++ b/Mode @@ -1 +1 @@ -Subproject commit edd42374a83b481ddd2ac71a8a593eb869bd5d36 +Subproject commit 1abd28d533c4a005149252b2b00aef7ea1499231 From 41833b3666bca3c810208f615fefdcfc404b3193 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 19 Apr 2010 22:01:01 -0400 Subject: [PATCH 20/24] updating ref for FlxInvaders submodule --- FlxInvaders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FlxInvaders b/FlxInvaders index 3a846ce..3b3e8ca 160000 --- a/FlxInvaders +++ b/FlxInvaders @@ -1 +1 @@ -Subproject commit 3a846ce1fef29a46e5bafe3c68d72ca10d72faae +Subproject commit 3b3e8cabb2ca19e7d05eb7deded7b7b6556f5a0c From 746882e429ce927f28c6b7bd63485d4e053d4a0e Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 19 Apr 2010 22:18:04 -0400 Subject: [PATCH 21/24] updating ref for FlxInvaders --- FlxInvaders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FlxInvaders b/FlxInvaders index 3b3e8ca..61b7c5f 160000 --- a/FlxInvaders +++ b/FlxInvaders @@ -1 +1 @@ -Subproject commit 3b3e8cabb2ca19e7d05eb7deded7b7b6556f5a0c +Subproject commit 61b7c5f050862b91fbac8a3dcb632955bf74e019 From 20e82e612997088285a711c81f1dc004bc7103a7 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Fri, 23 Apr 2010 22:37:46 -0400 Subject: [PATCH 22/24] fixing height for FlxInvaders shell --- dist/FlxInvaders.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/FlxInvaders.properties b/dist/FlxInvaders.properties index f88fc4f..7c64bf1 100644 --- a/dist/FlxInvaders.properties +++ b/dist/FlxInvaders.properties @@ -2,5 +2,5 @@ title=Flixel Invaders bgcolor=#000 application=flixel-invaders-app swf=FlxInvaders -width=800 -height=600 +width=640 +height=480 From ab31a3fcb935cea05c1adb4ba68719e868b8fe50 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Fri, 23 Apr 2010 22:40:08 -0400 Subject: [PATCH 23/24] updating refs to some submodules --- FlxBlur | 2 +- FlxInvaders | 2 +- HelloWorld | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FlxBlur b/FlxBlur index 5d3bc8c..91c0421 160000 --- a/FlxBlur +++ b/FlxBlur @@ -1 +1 @@ -Subproject commit 5d3bc8cbe0cbe221a7990c580711c10ebd043d77 +Subproject commit 91c04213927598f054f9c53b3813c568e6d4b470 diff --git a/FlxInvaders b/FlxInvaders index 61b7c5f..847db9d 160000 --- a/FlxInvaders +++ b/FlxInvaders @@ -1 +1 @@ -Subproject commit 61b7c5f050862b91fbac8a3dcb632955bf74e019 +Subproject commit 847db9dd9dcb3d74916e95be3ef7b60ecf20265c diff --git a/HelloWorld b/HelloWorld index c8744ad..9e09b27 160000 --- a/HelloWorld +++ b/HelloWorld @@ -1 +1 @@ -Subproject commit c8744ad02d4c9e97f2978e727368f858d37df786 +Subproject commit 9e09b278c881bacab4adcea76222bd2efbfd1e2f From e7a5a8c52f0547817a386cf8900847ad9e544933 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Tue, 27 Apr 2010 21:37:32 -0400 Subject: [PATCH 24/24] updating ref to FlxInvaders --- FlxInvaders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FlxInvaders b/FlxInvaders index 847db9d..3ee355b 160000 --- a/FlxInvaders +++ b/FlxInvaders @@ -1 +1 @@ -Subproject commit 847db9dd9dcb3d74916e95be3ef7b60ecf20265c +Subproject commit 3ee355b5d143db62346901ed62b907add71e7e48