You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ti...@apache.org on 2012/09/20 01:52:26 UTC
webworks commit: [CB-1493] - finally got this stuff working on windows
Updated Branches:
refs/heads/master adb1d9d12 -> 533a6c5eb
[CB-1493] - finally got this stuff working on windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/commit/533a6c5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/tree/533a6c5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/diff/533a6c5e
Branch: refs/heads/master
Commit: 533a6c5eb382fcd81ff324927b458977cd123ebb
Parents: adb1d9d
Author: Tim Kim <ti...@nitobi.com>
Authored: Wed Sep 19 16:52:16 2012 -0700
Committer: Tim Kim <ti...@nitobi.com>
Committed: Wed Sep 19 16:52:16 2012 -0700
----------------------------------------------------------------------
bin/create.bat | 2 +-
bin/create.js | 18 +++++++-----------
2 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/533a6c5e/bin/create.bat
----------------------------------------------------------------------
diff --git a/bin/create.bat b/bin/create.bat
index ab5d45f..ecb039a 100644
--- a/bin/create.bat
+++ b/bin/create.bat
@@ -1,3 +1,4 @@
+@ECHO OFF
goto comment
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,7 +18,6 @@ goto comment
under the License.
:comment
-@ECHO OFF
IF NOT DEFINED JAVA_HOME GOTO MISSING
FOR %%X in (ant.bat) do (
SET FOUND=%%~$PATH:X
http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/533a6c5e/bin/create.js
----------------------------------------------------------------------
diff --git a/bin/create.js b/bin/create.js
index da0dc31..1b823b7 100644
--- a/bin/create.js
+++ b/bin/create.js
@@ -44,8 +44,8 @@ function replaceInFile(filename, regexp, replacement) {
}
function downloadAntContrib(){
if (!fso.FileExists(ROOT + '\\bin\\templates\\project\\lib\\ant-contrib\\ant-contrib-1.0b3.jar')) {
- // We need the .jar - url is pretty ugly, but unsure how to get around the re-direct on the download page other than using the direct download link
- var url = 'http://downloads.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fant-contrib%2Ffiles%2Fant-contrib%2F1.0b3%2F&ts=1348092193&use_mirror=voxel';
+ // We need the .jar
+ var url = 'http://softlayer.dl.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip';
var libsPath = ROOT + '\\bin\\templates\\project\\lib';
var savePath = libsPath + '\\ant-contrib-1.0b3-bin.zip';
if (!fso.FileExists(savePath)) {
@@ -72,13 +72,11 @@ function downloadAntContrib(){
var source = app.NameSpace(savePath).Items();
var target = app.NameSpace(libsPath);
target.CopyHere(source, 256);
-
- // Move the jar into libs
- //fso.MoveFile(ROOT + '\\framework\\libs\\commons-codec-1.7\\commons-codec-1.7.jar', ROOT + '\\framework\\libs\\commons-codec-1.7.jar');
-
+
// Clean up
- //fso.DeleteFile(ROOT + '\\framework\\libs\\commons-codec-1.7-bin.zip');
- //fso.DeleteFolder(ROOT + '\\framework\\libs\\commons-codec-1.7', true);
+ fso.DeleteFile(libsPath + '\\ant-contrib-1.0b3-bin.zip');
+ fso.DeleteFolder(libsPath + '\\ant-contrib\\docs', true);
+ fso.DeleteFolder(libsPath + '\\ant-contrib\\lib', true);
}
}
function exec(s, output) {
@@ -128,7 +126,5 @@ if(fso.FolderExists(ROOT+'\\framework')){
// copy in the project template
exec('cmd /c xcopy '+ ROOT + '\\sample\\* '+PROJECT_PATH+' /I /S /Y');
}
-
replaceInFile(MANIFEST_PATH, /__NAME__/, APPNAME);
-
-cleanup();
+cleanup();
\ No newline at end of file