Skip to content

Commit

Permalink
Merge fun
Browse files Browse the repository at this point in the history
  • Loading branch information
Fil Maj committed Aug 10, 2009
2 parents f4fde71 + ff4f2a7 commit 336a3fb
Show file tree
Hide file tree
Showing 39 changed files with 2,026 additions and 896 deletions.
7 changes: 0 additions & 7 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
.DS_Store
.*.sw?
*.cso
tmp/
*.xcodeproj/* !*.xcodeproj/project.pbxproj
lib/iphone/phonegap-min.js
lib/iphone/phonegap.js
android/default.properties
android/bin/*
android/gen/*
16 changes: 11 additions & 5 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ iphone/www/phonegap.js: lib/iphone/phonegap-min.js
docs :: javascript_docs iphone_docs

iphone_docs:
javascript_docs :: javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js
$(JAVA) -jar util/jsdoc-toolkit/jsrun.jar util/jsdoc-toolkit/app/run.js -a -d=docs/javascript -t=util/jsdoc-toolkit/templates/jsdoc javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js
javascript_docs :: javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/compass.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js
$(JAVA) -jar util/jsdoc-toolkit/jsrun.jar util/jsdoc-toolkit/app/run.js -a -d=docs/javascript -t=util/jsdoc-toolkit/templates/jsdoc javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/compass.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js
iphone: lib/iphone/phonegap-min.js

lib/iphone/phonegap-min.js: lib/iphone/phonegap.js
$(JAVA) -jar util/yuicompressor-2.4.2.jar --charset UTF-8 -o $@ lib/iphone/phonegap.js

lib/iphone/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js javascripts/iphone/accelerometer.js javascripts/iphone/bonjour.js javascripts/iphone/contact.js javascripts/iphone/debugconsole.js javascripts/iphone/device.js javascripts/iphone/geolocation.js javascripts/iphone/media.js javascripts/iphone/notification.js javascripts/iphone/phonegap.js javascripts/iphone/uicontrols.js
lib/iphone/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/compass.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js javascripts/iphone/accelerometer.js javascripts/iphone/bonjour.js javascripts/iphone/contact.js javascripts/iphone/camera.js javascripts/iphone/debugconsole.js javascripts/iphone/device.js javascripts/iphone/geolocation.js javascripts/iphone/compass.js javascripts/iphone/media.js javascripts/iphone/notification.js javascripts/iphone/phonegap.js javascripts/iphone/uicontrols.js
$(RM_RF) lib/iphone
$(MKPATH) lib/iphone
$(RM_F) $@
Expand All @@ -56,6 +56,7 @@ lib/iphone/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js
$(CAT) javascripts/device.js >> $@
$(CAT) javascripts/file.js >> $@
$(CAT) javascripts/geolocation.js >> $@
$(CAT) javascripts/compass.js >> $@
$(CAT) javascripts/map.js >> $@
$(CAT) javascripts/media.js >> $@
$(CAT) javascripts/notification.js >> $@
Expand All @@ -67,9 +68,11 @@ lib/iphone/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js
$(CAT) javascripts/iphone/accelerometer.js >> $@
$(CAT) javascripts/iphone/bonjour.js >> $@
$(CAT) javascripts/iphone/contact.js >> $@
$(CAT) javascripts/iphone/camera.js >> $@
$(CAT) javascripts/iphone/debugconsole.js >> $@
$(CAT) javascripts/iphone/device.js >> $@
$(CAT) javascripts/iphone/geolocation.js >> $@
$(CAT) javascripts/iphone/compass.js >> $@
$(CAT) javascripts/iphone/media.js >> $@
$(CAT) javascripts/iphone/notification.js >> $@
$(CAT) javascripts/iphone/phonegap.js >> $@
Expand All @@ -79,7 +82,7 @@ blackberry: lib/blackberry/phonegap-min.js
lib/blackberry/phonegap-min.js: lib/blackberry/phonegap.js
$(JAVA) -jar util/yuicompressor-2.4.2.jar --charset UTF-8 -o $@ lib/blackberry/phonegap.js

lib/blackberry/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js javascripts/blackberry/file.js javascripts/blackberry/geolocation.js
lib/blackberry/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/compass.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js javascripts/blackberry/file.js javascripts/blackberry/geolocation.js
$(RM_RF) lib/blackberry
$(MKPATH) lib/blackberry
$(RM_F) $@
Expand All @@ -92,6 +95,7 @@ lib/blackberry/phonegap.js: javascripts/phonegap.js.base javascripts/acceleratio
$(CAT) javascripts/device.js >> $@
$(CAT) javascripts/file.js >> $@
$(CAT) javascripts/geolocation.js >> $@
$(CAT) javascripts/compass.js >> $@
$(CAT) javascripts/map.js >> $@
$(CAT) javascripts/media.js >> $@
$(CAT) javascripts/notification.js >> $@
Expand All @@ -107,7 +111,7 @@ android: lib/android/phonegap-min.js
lib/android/phonegap-min.js: lib/android/phonegap.js
$(JAVA) -jar util/yuicompressor-2.4.2.jar --charset UTF-8 -o $@ lib/android/phonegap.js

lib/android/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js javascripts/android/device.js javascripts/android/geolocation.js javascripts/android/notification.js
lib/android/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.js javascripts/accelerometer.js javascripts/camera.js javascripts/contact.js javascripts/debugconsole.js javascripts/device.js javascripts/file.js javascripts/geolocation.js javascripts/compass.js javascripts/map.js javascripts/media.js javascripts/notification.js javascripts/orientation.js javascripts/position.js javascripts/sms.js javascripts/telephony.js javascripts/uicontrols.js javascripts/android/device.js javascripts/android/geolocation.js javascripts/android/notification.js
$(RM_RF) lib/android
$(MKPATH) lib/android
$(RM_F) $@
Expand All @@ -120,6 +124,7 @@ lib/android/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.j
$(CAT) javascripts/device.js >> $@
$(CAT) javascripts/file.js >> $@
$(CAT) javascripts/geolocation.js >> $@
$(CAT) javascripts/compass.js >> $@
$(CAT) javascripts/map.js >> $@
$(CAT) javascripts/media.js >> $@
$(CAT) javascripts/notification.js >> $@
Expand All @@ -131,3 +136,4 @@ lib/android/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.j
$(CAT) javascripts/android/device.js >> $@
$(CAT) javascripts/android/geolocation.js >> $@
$(CAT) javascripts/android/notification.js >> $@
$(CAT) javascripts/android/accelerometer.js >> $@
Loading

0 comments on commit 336a3fb

Please sign in to comment.