cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hermw...@apache.org
Subject git commit: merging changes for app packaging
Date Thu, 14 Mar 2013 21:20:50 GMT
Updated Branches:
  refs/heads/master dea40367a -> bbc5c4d18


merging changes for app packaging


Project: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/commit/bbc5c4d1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/tree/bbc5c4d1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/diff/bbc5c4d1

Branch: refs/heads/master
Commit: bbc5c4d187e475d49a2600e379320cb00b6a3643
Parents: dea4036
Author: Gord Tanner <gtanner@gmail.com>
Authored: Fri Feb 15 21:17:04 2013 -0500
Committer: hermwong <herm.wong@gmail.com>
Committed: Thu Mar 14 14:19:20 2013 -0700

----------------------------------------------------------------------
 .gitignore                |    6 ++----
 Makefile                  |    8 +++++---
 framework/application.zip |  Bin 1826 -> 0 bytes
 3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/bbc5c4d1/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 7fcb202..a322772 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
-<<<<<<< HEAD
 # OS X
 .DS_Store
-=======
 node_modules/
-.DS_Store
 example/
->>>>>>> Added ./bin/create script for b2g
+framework/application.zip
+framework/cordova-*.js

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/bbc5c4d1/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index bc13b07..5481ac5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,16 @@ PORT_LOCAL = 6000
 XPCSHELL ?= ~/Documents/mozilla/mozilla-central/obj-x86_64-apple-darwin11.4.2/dist/bin/xpcshell
 ADB ?= adb
 FOLDER = framework
-PGVERSION = 2.4.0
+VERSION := $(shell cat VERSION)
+
+
 
 all :: packaged install
 
 copy_js:
-	cp lib/cordova.webos.js framework/cordova-$(PGVERSION).js
+	cp lib/cordova.firefoxos.js framework/cordova-$(VERSION).js
 
-package:
+package: copy_js
 	cd ./${FOLDER} && zip -X ./application.zip ./* -x application.zip
 
 packaged: package

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/bbc5c4d1/framework/application.zip
----------------------------------------------------------------------
diff --git a/framework/application.zip b/framework/application.zip
deleted file mode 100644
index 2c469ce..0000000
Binary files a/framework/application.zip and /dev/null differ


Mime
View raw message