You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by za...@apache.org on 2014/06/11 08:14:49 UTC

[1/5] git commit: add icons

Repository: cordova-firefoxos
Updated Branches:
  refs/heads/master 1cdee48ae -> a68d0ad5c


add icons


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

Branch: refs/heads/master
Commit: 18d79325bcf388d1cc27e1c8edbe5994f2a3a810
Parents: 1cdee48
Author: Willy Aguirre <ma...@gmail.com>
Authored: Sat Jun 7 19:01:05 2014 -0500
Committer: Willy Aguirre <ma...@gmail.com>
Committed: Sat Jun 7 19:01:05 2014 -0500

----------------------------------------------------------------------
 bin/lib/create.js                                  |   6 +++++-
 .../project/platform_www/icon/icon-128.png         | Bin 0 -> 11401 bytes
 .../project/platform_www/icon/icon-60.png          | Bin 0 -> 6979 bytes
 bin/templates/project/res/icon-128.png             | Bin 0 -> 11401 bytes
 bin/templates/project/res/icon-60.png              | Bin 0 -> 6979 bytes
 5 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/18d79325/bin/lib/create.js
----------------------------------------------------------------------
diff --git a/bin/lib/create.js b/bin/lib/create.js
index 6b90cc8..2973138 100755
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -63,7 +63,11 @@ exports.createProject = function(project_path,package_name,project_name){
     shjs.cp( path.join(ROOT, 'bin', 'lib', 'check_reqs.js'), path.join(project_path,'cordova', 'lib'));
     
     //copy cordova directory
-    shjs.cp('-r', path.join(ROOT, 'bin', 'templates', 'project', 'cordova'), project_path); 
+    shjs.cp('-r', path.join(ROOT, 'bin', 'templates', 'project', 'cordova'), project_path);
+
+    // project folder
+    shjs.cp('-r', path.join(ROOT, 'bin', 'templates', 'project', 'platform_www'), project_path);
+
     [
         'run',
         'build',

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/18d79325/bin/templates/project/platform_www/icon/icon-128.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/platform_www/icon/icon-128.png b/bin/templates/project/platform_www/icon/icon-128.png
new file mode 100644
index 0000000..3516df3
Binary files /dev/null and b/bin/templates/project/platform_www/icon/icon-128.png differ

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/18d79325/bin/templates/project/platform_www/icon/icon-60.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/platform_www/icon/icon-60.png b/bin/templates/project/platform_www/icon/icon-60.png
new file mode 100644
index 0000000..9e5c96f
Binary files /dev/null and b/bin/templates/project/platform_www/icon/icon-60.png differ

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/18d79325/bin/templates/project/res/icon-128.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/res/icon-128.png b/bin/templates/project/res/icon-128.png
new file mode 100644
index 0000000..3516df3
Binary files /dev/null and b/bin/templates/project/res/icon-128.png differ

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/18d79325/bin/templates/project/res/icon-60.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/res/icon-60.png b/bin/templates/project/res/icon-60.png
new file mode 100644
index 0000000..9e5c96f
Binary files /dev/null and b/bin/templates/project/res/icon-60.png differ


[5/5] git commit: Merge remote-tracking branch 'marti/new-icon'

Posted by za...@apache.org.
Merge remote-tracking branch 'marti/new-icon'


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

Branch: refs/heads/master
Commit: a68d0ad5cd72612e5070a277936cad7dffea6617
Parents: 1cdee48 de8f25b
Author: Piotr Zalewa <pi...@zalewa.info>
Authored: Wed Jun 11 08:14:17 2014 +0200
Committer: Piotr Zalewa <pi...@zalewa.info>
Committed: Wed Jun 11 08:14:17 2014 +0200

----------------------------------------------------------------------
 bin/lib/create.js                                  |   6 +++++-
 bin/templates/project/cordova/defaults.xml         |   5 +++++
 .../project/platform_www/icon/icon-128.png         | Bin 0 -> 11401 bytes
 .../project/platform_www/icon/icon-60.png          | Bin 0 -> 6979 bytes
 4 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[3/5] git commit: update

Posted by za...@apache.org.
update


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

Branch: refs/heads/master
Commit: cc8f5dd2b5a5679bf3c02872ff7108648c87a40f
Parents: 97b57cb
Author: Willy Aguirre <ma...@gmail.com>
Authored: Mon Jun 9 20:56:07 2014 -0500
Committer: Willy Aguirre <ma...@gmail.com>
Committed: Mon Jun 9 20:56:07 2014 -0500

----------------------------------------------------------------------
 bin/templates/project/platform_www/icon-128.png    | Bin 0 -> 11401 bytes
 bin/templates/project/platform_www/icon-60.png     | Bin 0 -> 6979 bytes
 .../project/platform_www/icon/icon-128.png         | Bin 11401 -> 0 bytes
 .../project/platform_www/icon/icon-60.png          | Bin 6979 -> 0 bytes
 bin/templates/project/res/icon-128.png             | Bin 11401 -> 0 bytes
 bin/templates/project/res/icon-60.png              | Bin 6979 -> 0 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/cc8f5dd2/bin/templates/project/platform_www/icon-128.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/platform_www/icon-128.png b/bin/templates/project/platform_www/icon-128.png
new file mode 100644
index 0000000..3516df3
Binary files /dev/null and b/bin/templates/project/platform_www/icon-128.png differ

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/cc8f5dd2/bin/templates/project/platform_www/icon-60.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/platform_www/icon-60.png b/bin/templates/project/platform_www/icon-60.png
new file mode 100644
index 0000000..9e5c96f
Binary files /dev/null and b/bin/templates/project/platform_www/icon-60.png differ

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/cc8f5dd2/bin/templates/project/platform_www/icon/icon-128.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/platform_www/icon/icon-128.png b/bin/templates/project/platform_www/icon/icon-128.png
deleted file mode 100644
index 3516df3..0000000
Binary files a/bin/templates/project/platform_www/icon/icon-128.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/cc8f5dd2/bin/templates/project/platform_www/icon/icon-60.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/platform_www/icon/icon-60.png b/bin/templates/project/platform_www/icon/icon-60.png
deleted file mode 100644
index 9e5c96f..0000000
Binary files a/bin/templates/project/platform_www/icon/icon-60.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/cc8f5dd2/bin/templates/project/res/icon-128.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/res/icon-128.png b/bin/templates/project/res/icon-128.png
deleted file mode 100644
index 3516df3..0000000
Binary files a/bin/templates/project/res/icon-128.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/cc8f5dd2/bin/templates/project/res/icon-60.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/res/icon-60.png b/bin/templates/project/res/icon-60.png
deleted file mode 100644
index 9e5c96f..0000000
Binary files a/bin/templates/project/res/icon-60.png and /dev/null differ


[4/5] git commit: update project

Posted by za...@apache.org.
update project


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

Branch: refs/heads/master
Commit: de8f25b29542a2ea83adf6307f2d1bf535c81ade
Parents: cc8f5dd
Author: Willy Aguirre <ma...@gmail.com>
Authored: Tue Jun 10 12:30:14 2014 -0500
Committer: Willy Aguirre <ma...@gmail.com>
Committed: Tue Jun 10 12:30:14 2014 -0500

----------------------------------------------------------------------
 bin/lib/create.js                                  |   2 +-
 bin/templates/project/platform_www/icon-128.png    | Bin 11401 -> 0 bytes
 bin/templates/project/platform_www/icon-60.png     | Bin 6979 -> 0 bytes
 .../project/platform_www/icon/icon-128.png         | Bin 0 -> 11401 bytes
 .../project/platform_www/icon/icon-60.png          | Bin 0 -> 6979 bytes
 5 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/de8f25b2/bin/lib/create.js
----------------------------------------------------------------------
diff --git a/bin/lib/create.js b/bin/lib/create.js
index 2973138..48fb2e8 100755
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -65,7 +65,7 @@ exports.createProject = function(project_path,package_name,project_name){
     //copy cordova directory
     shjs.cp('-r', path.join(ROOT, 'bin', 'templates', 'project', 'cordova'), project_path);
 
-    // project folder
+    //copy platform_www to project folder
     shjs.cp('-r', path.join(ROOT, 'bin', 'templates', 'project', 'platform_www'), project_path);
 
     [

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/de8f25b2/bin/templates/project/platform_www/icon-128.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/platform_www/icon-128.png b/bin/templates/project/platform_www/icon-128.png
deleted file mode 100644
index 3516df3..0000000
Binary files a/bin/templates/project/platform_www/icon-128.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/de8f25b2/bin/templates/project/platform_www/icon-60.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/platform_www/icon-60.png b/bin/templates/project/platform_www/icon-60.png
deleted file mode 100644
index 9e5c96f..0000000
Binary files a/bin/templates/project/platform_www/icon-60.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/de8f25b2/bin/templates/project/platform_www/icon/icon-128.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/platform_www/icon/icon-128.png b/bin/templates/project/platform_www/icon/icon-128.png
new file mode 100644
index 0000000..3516df3
Binary files /dev/null and b/bin/templates/project/platform_www/icon/icon-128.png differ

http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/de8f25b2/bin/templates/project/platform_www/icon/icon-60.png
----------------------------------------------------------------------
diff --git a/bin/templates/project/platform_www/icon/icon-60.png b/bin/templates/project/platform_www/icon/icon-60.png
new file mode 100644
index 0000000..9e5c96f
Binary files /dev/null and b/bin/templates/project/platform_www/icon/icon-60.png differ


[2/5] git commit: update defaults

Posted by za...@apache.org.
update defaults


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

Branch: refs/heads/master
Commit: 97b57cb1d83e3fe527b508743c91513b50e8e0a6
Parents: 18d7932
Author: Willy Aguirre <ma...@gmail.com>
Authored: Mon Jun 9 20:29:51 2014 -0500
Committer: Willy Aguirre <ma...@gmail.com>
Committed: Mon Jun 9 20:29:51 2014 -0500

----------------------------------------------------------------------
 bin/templates/project/cordova/defaults.xml | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/97b57cb1/bin/templates/project/cordova/defaults.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/defaults.xml b/bin/templates/project/cordova/defaults.xml
index a7b31c0..804dddc 100644
--- a/bin/templates/project/cordova/defaults.xml
+++ b/bin/templates/project/cordova/defaults.xml
@@ -19,4 +19,9 @@
 -->
 <widget id="io.cordova.hellocordova" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
 
+      <platform name="firefoxos">
+            <icon src="icon/icon-128.png" width="128" height="128" />
+            <icon src="icon/icon-60.png" width="60" height="60" />
+      </platform>
+
 </widget>