mirror of
https://github.com/apache/cordova-android.git
synced 2025-01-31 17:32:51 +08:00
Change to PhoneGap naming convention affects droidgap creation & update. Also, create script uses phonegap-x.js, not phonegap-x.min.js.
This commit is contained in:
parent
d4ccc702b2
commit
f19d8f9bba
@ -5,7 +5,7 @@
|
|||||||
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
|
||||||
<title>PhoneGap</title>
|
<title>PhoneGap</title>
|
||||||
<link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8">
|
<link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8">
|
||||||
<script type="text/javascript" charset="utf-8" src="phonegap-0.9.6.1.min.js"></script>
|
<script type="text/javascript" charset="utf-8" src="phonegap-0.9.6.1.js"></script>
|
||||||
<script type="text/javascript" charset="utf-8" src="main.js"></script>
|
<script type="text/javascript" charset="utf-8" src="main.js"></script>
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
|
@ -93,7 +93,7 @@ class Classic
|
|||||||
app_res_dir = File.join(@path, "res")
|
app_res_dir = File.join(@path, "res")
|
||||||
# copies in the jar
|
# copies in the jar
|
||||||
FileUtils.mkdir_p File.join(@path, "libs")
|
FileUtils.mkdir_p File.join(@path, "libs")
|
||||||
FileUtils.cp File.join(@framework_dir, "phonegap.#{ version }.jar"), File.join(@path, "libs")
|
FileUtils.cp File.join(@framework_dir, "phonegap-#{ version }.jar"), File.join(@path, "libs")
|
||||||
# copies in the strings.xml
|
# copies in the strings.xml
|
||||||
FileUtils.mkdir_p File.join(app_res_dir, "values")
|
FileUtils.mkdir_p File.join(app_res_dir, "values")
|
||||||
FileUtils.cp File.join(framework_res_dir, "values","strings.xml"), File.join(app_res_dir, "values", "strings.xml")
|
FileUtils.cp File.join(framework_res_dir, "values","strings.xml"), File.join(app_res_dir, "values", "strings.xml")
|
||||||
@ -128,7 +128,7 @@ class Classic
|
|||||||
phonegapjs << IO.read(File.join(js_dir, script))
|
phonegapjs << IO.read(File.join(js_dir, script))
|
||||||
phonegapjs << "\n\n"
|
phonegapjs << "\n\n"
|
||||||
end
|
end
|
||||||
File.open(File.join(@path, "assets", "www", @app_js_dir, "phonegap.#{ version }.js"), 'w') {|f| f.write(phonegapjs) }
|
File.open(File.join(@path, "assets", "www", @app_js_dir, "phonegap-#{ version }.js"), 'w') {|f| f.write(phonegapjs) }
|
||||||
end
|
end
|
||||||
|
|
||||||
# puts app name in strings
|
# puts app name in strings
|
||||||
|
@ -35,7 +35,7 @@ class Update
|
|||||||
puts "Copying over libraries and assets..."
|
puts "Copying over libraries and assets..."
|
||||||
version = IO.read(File.join(@framework_dir, '../VERSION'))
|
version = IO.read(File.join(@framework_dir, '../VERSION'))
|
||||||
|
|
||||||
FileUtils.cp File.join(@framework_dir, "phonegap.#{ version }.jar"), File.join(@path, "libs")
|
FileUtils.cp File.join(@framework_dir, "phonegap-#{ version }.jar"), File.join(@path, "libs")
|
||||||
|
|
||||||
# concat JS and put into www folder. this can be overridden in the config.xml via @app_js_dir
|
# concat JS and put into www folder. this can be overridden in the config.xml via @app_js_dir
|
||||||
js_dir = File.join(@framework_dir, "assets", "js")
|
js_dir = File.join(@framework_dir, "assets", "js")
|
||||||
@ -45,7 +45,7 @@ class Update
|
|||||||
phonegapjs << IO.read(File.join(js_dir, script))
|
phonegapjs << IO.read(File.join(js_dir, script))
|
||||||
phonegapjs << "\n\n"
|
phonegapjs << "\n\n"
|
||||||
end
|
end
|
||||||
File.open(File.join(@path, "assets", "www", "phonegap.#{ version }.js"), 'w') {|f| f.write(phonegapjs) }
|
File.open(File.join(@path, "assets", "www", "phonegap-#{ version }.js"), 'w') {|f| f.write(phonegapjs) }
|
||||||
end
|
end
|
||||||
#
|
#
|
||||||
end
|
end
|
Loading…
Reference in New Issue
Block a user