You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2012/07/30 21:58:36 UTC
[15/15] ios commit: [CB-1091] Removed installer and related
dependencies. Moved original post-install script into makefile under
"install" target (which is default target).
[CB-1091] Removed installer and related dependencies. Moved original post-install script into makefile under "install" target (which is default target).
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/b464e4c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/b464e4c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/b464e4c5
Branch: refs/heads/master
Commit: b464e4c5cc6dd6acca42d150f67cb174f5c9be5b
Parents: c181db1
Author: Fil Maj <ma...@gmail.com>
Authored: Mon Jul 23 17:04:43 2012 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Tue Jul 24 12:39:43 2012 -0700
----------------------------------------------------------------------
.gitignore | 10 +-
.../01cordovalib-contents.xml | 21 --
.../CordovaInstaller.pmdoc/01cordovalib.xml | 53 ----
CordovaInstaller/CordovaInstaller.pmdoc/index.xml | 52 ---
CordovaInstaller/cordova.png | Bin 41499 -> 0 bytes
CordovaInstaller/docs/.gitignore | 3 -
CordovaInstaller/docs/README | 12 -
CordovaInstaller/scripts/xcodevars.postinstall | 39 ---
Makefile | 242 ++++-----------
9 files changed, 57 insertions(+), 375 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/b464e4c5/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 07e7ef8..5af177e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,22 +3,14 @@
*.cso
tmp
lib
-CordovaInstaller.pkg
*.mode1v3
*.pbxuser
build
_build.bak
/Cordova.framework/
-/pkg_error_log
*.xcworkspace
xcuserdata
-/dist/
-/Markdown_1.0.1/
-Markdown_*.zip
example
CordovaLib/javascript/cordova-*.js
-wkhtmltopdf.dmg
-wkhtmltopdf/
-
CordovaLib/CordovaLibApp/www/cordova.ios.js
-console.log
\ No newline at end of file
+console.log
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/b464e4c5/CordovaInstaller/CordovaInstaller.pmdoc/01cordovalib-contents.xml
----------------------------------------------------------------------
diff --git a/CordovaInstaller/CordovaInstaller.pmdoc/01cordovalib-contents.xml b/CordovaInstaller/CordovaInstaller.pmdoc/01cordovalib-contents.xml
deleted file mode 100644
index 265d9a2..0000000
--- a/CordovaInstaller/CordovaInstaller.pmdoc/01cordovalib-contents.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<pkg-contents spec="1.12">
-</pkg-contents>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/b464e4c5/CordovaInstaller/CordovaInstaller.pmdoc/01cordovalib.xml
----------------------------------------------------------------------
diff --git a/CordovaInstaller/CordovaInstaller.pmdoc/01cordovalib.xml b/CordovaInstaller/CordovaInstaller.pmdoc/01cordovalib.xml
deleted file mode 100644
index b81fd40..0000000
--- a/CordovaInstaller/CordovaInstaller.pmdoc/01cordovalib.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<pkgref spec="1.12" uuid="0D80338D-25E2-4B70-A3D7-36B86FE654F5">
- <config>
- <identifier>org.apache.cordovalibinstaller.cordovalib.pkg</identifier>
- <version>1.0</version>
- <description/>
- <post-install type="none"/>
- <installFrom relative="true" mod="true">../CordovaLib</installFrom>
- <installTo mod="true">/Documents/CordovaLib</installTo>
- <flags>
- <followSymbolicLinks/>
- </flags>
- <packageStore type="internal"/>
- <mod>installTo</mod>
- <mod>scripts.scriptsDirectoryPath.path</mod>
- <mod>installFrom.path</mod>
- <mod>scripts.postinstall.path</mod>
- <mod>identifier</mod>
- <mod>parent</mod>
- <mod>requireAuthorization</mod>
- <mod>installTo.path</mod>
- </config>
- <scripts>
- <postinstall relative="true" mod="true">scripts/xcodevars.postinstall</postinstall>
- <scripts-dir relative="true" mod="true">scripts</scripts-dir>
- </scripts>
- <contents>
- <file-list>01cordovalib-contents.xml</file-list>
- <filter>/CVS$</filter>
- <filter>/\.svn$</filter>
- <filter>/\.cvsignore$</filter>
- <filter>/\.cvspass$</filter>
- <filter>/\.DS_Store$</filter>
- </contents>
-</pkgref>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/b464e4c5/CordovaInstaller/CordovaInstaller.pmdoc/index.xml
----------------------------------------------------------------------
diff --git a/CordovaInstaller/CordovaInstaller.pmdoc/index.xml b/CordovaInstaller/CordovaInstaller.pmdoc/index.xml
deleted file mode 100644
index f7a064b..0000000
--- a/CordovaInstaller/CordovaInstaller.pmdoc/index.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<pkmkdoc spec="1.12">
- <properties>
- <title>Cordova</title>
- <build></build>
- <organization>org.apache.cordovalibinstaller</organization>
- <userSees ui="easy"/>
- <min-target os="3"/>
- <domain user="true"/>
- </properties>
- <distribution>
- <versions min-spec="1.000000"/>
- <scripts/>
- </distribution>
- <contents>
- <choice title="CordovaLib" id="choice5" starts_selected="true" starts_enabled="true" starts_hidden="false">
- <pkgref id="org.apache.cordovalibinstaller.cordovalib.pkg"/>
- </choice>
- </contents>
- <resources bg-scale="none" bg-align="topleft">
- <locale lang="en">
- <resource relative="true" mod="true" type="background">cordova.png</resource>
- <resource relative="true" mod="true" type="readme">docs/readme.rtf</resource>
- <resource relative="true" mod="true" type="welcome">docs/releasenotes.rtf</resource>
- <resource relative="true" mod="true" type="conclusion">docs/firstrun.rtf</resource>
- </locale>
- </resources>
- <flags/>
- <item type="file">01cordovalib.xml</item>
- <mod>properties.title</mod>
- <mod>properties.userDomain</mod>
- <mod>properties.anywhereDomain</mod>
- <mod>preinstallActions.actions</mod>
-</pkmkdoc>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/b464e4c5/CordovaInstaller/cordova.png
----------------------------------------------------------------------
diff --git a/CordovaInstaller/cordova.png b/CordovaInstaller/cordova.png
deleted file mode 100644
index 99fdb7d..0000000
Binary files a/CordovaInstaller/cordova.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/b464e4c5/CordovaInstaller/docs/.gitignore
----------------------------------------------------------------------
diff --git a/CordovaInstaller/docs/.gitignore b/CordovaInstaller/docs/.gitignore
deleted file mode 100644
index 560cf76..0000000
--- a/CordovaInstaller/docs/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.rtf
-*.html
-*.md
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/b464e4c5/CordovaInstaller/docs/README
----------------------------------------------------------------------
diff --git a/CordovaInstaller/docs/README b/CordovaInstaller/docs/README
deleted file mode 100644
index f5f862c..0000000
--- a/CordovaInstaller/docs/README
+++ /dev/null
@@ -1,12 +0,0 @@
-The .txt files are gone, you will need to generate the .rtf files from the .html files - consequently edit the .html files, not the generated .rtf files.
-The conversions should have been taken care of in the Makefile.
-
-The conversion is done by the 'textutil' command line utility, included in OS X.
-
-example:
- textutil -convert rtf introduction.html
-
-which will output a file:
- introduction.rtf
-
-All .rtf files are git ignored in this folder.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/b464e4c5/CordovaInstaller/scripts/xcodevars.postinstall
----------------------------------------------------------------------
diff --git a/CordovaInstaller/scripts/xcodevars.postinstall b/CordovaInstaller/scripts/xcodevars.postinstall
deleted file mode 100755
index 17ed162..0000000
--- a/CordovaInstaller/scripts/xcodevars.postinstall
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-defaults write org.apache.cordovalib InstallLocation "$2"
-
-# Xcode 4
-defaults write com.apple.dt.Xcode IDEApplicationwideBuildSettings -dict-add CORDOVALIB "$2"
-defaults write com.apple.dt.Xcode IDESourceTreeDisplayNames -dict-add CORDOVALIB ""
-
-# Xcode 3
-defaults write com.apple.Xcode PBXApplicationwideBuildSettings -dict-add CORDOVALIB "$2"
-defaults write com.apple.Xcode PBXSourceTreeDisplayNames -dict-add CORDOVALIB ""
-
-# rename the existing Xcode 4 template
-
-XCODE4_TEMPLATE_FOLDER="$HOME/Library/Developer/Xcode/Templates/Project Templates/Application"
-EXISTING_XCODE4_TEMPLATE="$XCODE4_TEMPLATE_FOLDER/Cordova-based Application.xctemplate"
-RENAMED_XCODE4_TEMPLATE="$XCODE4_TEMPLATE_FOLDER/Cordova-based (pre 2.0) Application.xctemplate"
-
-if [ -d "$EXISTING_XCODE4_TEMPLATE" ]; then
- mv "$EXISTING_XCODE4_TEMPLATE" "$RENAMED_XCODE4_TEMPLATE"
-fi
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/b464e4c5/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index bddaf35..e0dbe7e 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,6 @@
## You can set these environment variables:
## XC_APP (path to your Xcode.app)
-## PM_APP (path to your PackageMaker app)
-## PKG_ERROR_LOG (error log)
## DEVELOPER (path to your Developer folder)
## - don't need to set this if you use 'xcode-select'
## - in Xcode 4.3, this is within your app bundle: Xcode.app/Contents/Developer
@@ -44,215 +42,87 @@ OPEN = open
ECHO = echo
ECHO_N = echo -n
JAVA = java
-CONVERTPDF = /System/Library/Printers/Libraries/convert
-COMBINEPDF = /System/Library/Automator/Combine\ PDF\ Pages.action/Contents/Resources/join.py
+PWD = `pwd`
+CORDOVA_LIB = $(PWD)/CordovaLib
DOXYGEN =
IPHONE_DOCSET_TMPDIR = docs/iphone/tmp
DEVELOPER ?= '$(shell xcode-select -print-path)'
-PM_APP ?= '$(shell mdfind "kMDItemFSName=='PackageMaker.app' && kMDItemKind=='Application'" | head -1)'
XC_APP ?= '$(shell mdfind "kMDItemFSName=='Xcode.app' && kMDItemKind=='Application'" | head -1)'
-PACKAGEMAKER = '$(PM_APP)/Contents/MacOS/PackageMaker'
XC = $(DEVELOPER)/usr/bin/xcodebuild
CDV_VER = $(shell head -1 CordovaLib/VERSION)
GIT = $(shell which git)
COMMIT_HASH=$(shell git describe --tags)
-PKG_ERROR_LOG ?= pkg_error_log
BUILD_BAK=_build.bak
CERTIFICATE = 'Cordova Support'
-WKHTMLTOPDF = wkhtmltopdf/wkhtmltopdf --dpi 300 --encoding utf-8 --page-size Letter --footer-font-name "Helvetica" --footer-font-size 10 --footer-spacing 10 --footer-right "[page]/[topage]" -B 1in -L 0.5in -R 0.5in -T 0.5in
-MARKDOWN = markdown
+XCODE4_TEMPLATE_FOLDER=$(HOME)/Library/Developer/Xcode/Templates/Project\ Templates/Application
+EXISTING_XCODE4_TEMPLATE=$(XCODE4_TEMPLATE_FOLDER)/Cordova-based\ Application.xctemplate
+RENAMED_XCODE4_TEMPLATE=$(XCODE4_TEMPLATE_FOLDER)/Cordova-based\ \(pre\ 2.0\)\ Application.xctemplate
-all :: installer
-
-clean-markdown:
- @$(RM_RF) CordovaInstaller/docs/*.html
-
-clean-installer:
- @$(RM_F) CordovaInstaller/docs/*.rtf
- @$(RM_F) CordovaInstaller/docs/*.html
- @$(RM_F) CordovaInstaller/docs/*.md
- @$(RM_F) CordovaInstaller/docs/*.pdf
- @$(RM_F) CordovaInstaller/docs/*.html
+all :: install
clean-cordova-lib:
- @if [ -e "$(BUILD_BAK)/VERSION" ]; then \
- $(CP) -Rf "CordovaLib/VERSION" ~/.Trash; \
- $(RM_RF) "CordovaLib/VERSION"; \
- $(MV) $(BUILD_BAK)/VERSION "CordovaLib/VERSION"; \
- fi
- @$(RM_RF) CordovaLib/build/
- @$(RM_F) CordovaLib/CordovaLib.xcodeproj/*.mode1v3
- @$(RM_F) CordovaLib/CordovaLib.xcodeproj/*.perspectivev3
- @$(RM_F) CordovaLib/CordovaLib.xcodeproj/*.pbxuser
- @$(RM_F) CordovaLib/javascript/cordova-*.js
+ @if [ -e "$(BUILD_BAK)/VERSION" ]; then \
+ @$(CP) -Rf "CordovaLib/VERSION" ~/.Trash; \
+ @$(RM_RF) "CordovaLib/VERSION"; \
+ @$(MV) $(BUILD_BAK)/VERSION "CordovaLib/VERSION"; \
+ fi
+ @$(RM_RF) CordovaLib/build/
+ @$(RM_F) CordovaLib/CordovaLib.xcodeproj/*.mode1v3
+ @$(RM_F) CordovaLib/CordovaLib.xcodeproj/*.perspectivev3
+ @$(RM_F) CordovaLib/CordovaLib.xcodeproj/*.pbxuser
+ @$(RM_F) CordovaLib/javascript/cordova-*.js
clean-bin:
- @$(RM_RF) bin/templates/project/build/
- @$(RM_RF) bin/templates/project/__TESTING__.xcodeproj/*.xcworkspace
- @$(RM_RF) bin/templates/project/__TESTING__.xcodeproj/xcuserdata
- @$(RM_F) bin/templates/project/__TESTING__.xcodeproj/*.perspectivev3
- @$(RM_F) bin/templates/project/__TESTING__.xcodeproj/*.pbxuser
+ @$(RM_RF) bin/templates/project/build/
+ @$(RM_RF) bin/templates/project/__TESTING__.xcodeproj/*.xcworkspace
+ @$(RM_RF) bin/templates/project/__TESTING__.xcodeproj/xcuserdata
+ @$(RM_F) bin/templates/project/__TESTING__.xcodeproj/*.perspectivev3
+ @$(RM_F) bin/templates/project/__TESTING__.xcodeproj/*.pbxuser
-clean: clean-installer clean-markdown clean-cordova-lib clean-bin
- @if [ -e "$(PKG_ERROR_LOG)" ]; then \
- $(MV) $(PKG_ERROR_LOG) ~/.Trash; \
- $(RM_F) $(PKG_ERROR_LOG); \
- fi
- @$(RM_RF) $(BUILD_BAK)
-
-check-os:
- @if [ "$$OSTYPE" != "darwin11" ]; then echo "Error: You need to package the installer on a Mac OS X 10.7 Lion system."; exit 1; fi
+clean: clean-cordova-lib clean-bin
+ @$(RM_RF) $(BUILD_BAK)
check-utils:
@if [[ ! -e $(XC_APP) ]]; then \
- echo -e '\033[31mError: Xcode.app at "$(XC_APP)" was not found. Please download from the Mac App Store.\033[m'; exit 1; \
+ echo -e '\033[31mError: Xcode.app at "$(XC_APP)" was not found. Please download from the Mac App Store.\033[m'; exit 1; \
fi
@if [[ ! -d $(DEVELOPER) ]]; then \
- echo -e '\033[31mError: The Xcode folder at "$(DEVELOPER)" was not found. Please set it to the proper one using xcode-select. For Xcode >= 4.3.1, set it using "sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer".\033[m'; exit 1; \
- fi
- @if [[ ! -e $(PM_APP) ]]; then \
- echo -e '\033[31mError: PackageMaker.app was not found. You need to download the Xcode Auxiliary Tools: https://developer.apple.com/downloads/index.action?name=auxiliary\033[m'; exit 1; \
+ echo -e '\033[31mError: The Xcode folder at "$(DEVELOPER)" was not found. Please set it to the proper one using xcode-select. For Xcode >= 4.3.1, set it using "sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer".\033[m'; exit 1; \
fi
@echo -e "Xcode.app: \t\t\033[33m$(XC_APP)\033[m";
@echo -e "Using Developer folder: \033[33m$(DEVELOPER)\033[m";
- @echo -e "Using PackageMaker app: \033[33m$(PM_APP)\033[m";
-update-template:
- @$(RM_F) bin/templates/project/www/cordova-*.js
- @$(CP) -f CordovaLib/javascript/cordova.ios.js bin/templates/project/www/cordova-$(CDV_VER).js
- @find "bin/templates/project/www/index.html" | xargs grep 'src[ ]*=[ ]*[\\'\"]cordova-*.*.js[\\'\"]' -sl | xargs -L1 sed -i "" "s/src[ ]*=[ ]*[\\'\"]cordova-*.*.js[\\'\"]/src=\"cordova-${CDV_VER}.js\"/g"
-
-installer: check-utils clean check-wkhtmltopdf md-to-html update-template
- @# remove the dist folder
- @if [ -d "dist" ]; then \
- $(CP) -Rf dist ~/.Trash; \
- $(RM_RF) dist; \
- fi
- @# backup markdown files for version replace
- @$(CAT) FirstRun.md | sed 's/{VERSION}/${CDV_VER}/' > CordovaInstaller/docs/FirstRun.md
- @$(CAT) RELEASENOTES.md | sed 's/{VERSION}/${CDV_VER}/' > CordovaInstaller/docs/RELEASENOTES.md
- @# generate releasenotes html from markdown
- @echo '<html><body style="font-family: Helvetica Neue;">' > CordovaInstaller/docs/releasenotes.html
- @$(MARKDOWN) CordovaInstaller/docs/RELEASENOTES.md >> CordovaInstaller/docs/releasenotes.html
- @echo '</body></html>' >> CordovaInstaller/docs/releasenotes.html
- @# generate firstrun html from markdown
- @echo '<html><body style="font-family: Helvetica Neue;">' > CordovaInstaller/docs/firstrun.html
- @$(MARKDOWN) CordovaInstaller/docs/FirstRun.md >> CordovaInstaller/docs/firstrun.html
- @echo '</body></html>' >> CordovaInstaller/docs/firstrun.html
- @# convert all the html files to rtf (for PackageMaker)
- @textutil -convert rtf -font 'Helvetica' CordovaInstaller/docs/*.html
- @# build the .pkg file
- @echo -n "Building Cordova-${CDV_VER}.pkg..."
- @$(MKPATH) dist/files/Guides
- @'$(PACKAGEMAKER)' -d CordovaInstaller/CordovaInstaller.pmdoc -o dist/files/Cordova-${CDV_VER}.pkg > /dev/null 2> $(PKG_ERROR_LOG)
- @# create the applescript uninstaller
- @osacompile -o ./dist/files/Uninstall\ Cordova.app Uninstall\ Cordova.applescript > /dev/null 2>> $(PKG_ERROR_LOG)
- @# convert the html docs to pdf, concatenate readme and license
- @$(WKHTMLTOPDF) --footer-center "Cordova ${CDV_VER} Release Notes" CordovaInstaller/docs/releasenotes.html dist/files/ReleaseNotes.pdf > /dev/null 2>> $(PKG_ERROR_LOG)
- @$(WKHTMLTOPDF) --footer-center "Cordova ${CDV_VER} Plugin Upgrade Guide" CordovaInstaller/docs/plugin_upgrade.html 'dist/files/Guides/Cordova Plugin Upgrade Guide.pdf' > /dev/null 2>> $(PKG_ERROR_LOG)
- @$(WKHTMLTOPDF) --footer-center "Cordova ${CDV_VER} Settings File" CordovaInstaller/docs/settings_file.html 'dist/files/Guides/Cordova Settings File.pdf' > /dev/null 2>> $(PKG_ERROR_LOG)
- @$(WKHTMLTOPDF) --footer-center "Cordova ${CDV_VER} JavaScript Exception Logging" CordovaInstaller/docs/exception_logging.html 'dist/files/Guides/Cordova JavaScript Exception Logging.pdf' > /dev/null 2>> $(PKG_ERROR_LOG)
- @$(WKHTMLTOPDF) --footer-center "Cordova ${CDV_VER} Custom URL Scheme Handling" CordovaInstaller/docs/custom_url_scheme.html 'dist/files/Guides/Cordova Custom URL Scheme Handling.pdf' > /dev/null 2>> $(PKG_ERROR_LOG)
- @textutil -convert html -font 'Courier New' LICENSE -output CordovaInstaller/docs/LICENSE.html > /dev/null 2>> $(PKG_ERROR_LOG)
- @textutil -cat html CordovaInstaller/docs/firstrun.html CordovaInstaller/docs/readme.html CordovaInstaller/docs/LICENSE.html -output dist/files/Readme.html > /dev/null 2>> $(PKG_ERROR_LOG)
- @$(WKHTMLTOPDF) --footer-center "Cordova ${CDV_VER} Readme" dist/files/Readme.html dist/files/Readme.pdf > /dev/null 2>> $(PKG_ERROR_LOG)
- @$(RM_F) dist/files/Readme.html
- @# copy the url shortcut
- @$(CP) -f "guides/Create a New Project.webloc" ./dist/files
- @# copy the bin folder
- @$(CP) -Rf bin dist/files/bin
- @# sign the .pkg : must be run under one line to get return code
- @-security find-certificate -c $(CERTIFICATE) > /dev/null 2>> $(PKG_ERROR_LOG); \
- if [ $$? -eq 0 ] ; then \
- '$(PACKAGEMAKER)' --certificate $(CERTIFICATE) --sign dist/files/Cordova-${CDV_VER}.pkg; \
- fi
- @# create the .dmg
- @hdiutil create ./dist/Cordova-${CDV_VER}_temp.dmg -srcfolder ./dist/files/ -ov -volname Cordova-${CDV_VER} -format UDRW > /dev/null 2>> $(PKG_ERROR_LOG)
- @# set the volume icon
- @hdiutil attach -readwrite -noverify -noautoopen ./dist/Cordova-${CDV_VER}_temp.dmg > /dev/null 2>> $(PKG_ERROR_LOG)
- @cp "bin/templates/project/__TESTING__.xcodeproj/TemplateIcon.icns" /Volumes/Cordova-${CDV_VER}/.VolumeIcon.icns
- @SetFile -c icnC /Volumes/Cordova-${CDV_VER}/.VolumeIcon.icns > /dev/null 2>> $(PKG_ERROR_LOG)
- @SetFile -a C /Volumes/Cordova-${CDV_VER}/ > /dev/null 2>> $(PKG_ERROR_LOG)
- @hdiutil detach /Volumes/Cordova-${CDV_VER}/ > /dev/null 2>> $(PKG_ERROR_LOG)
- @# compress dmg
- @hdiutil convert ./dist/Cordova-${CDV_VER}_temp.dmg -format UDZO -imagekey zlib-level=9 -o ./dist/Cordova-${CDV_VER}.dmg > /dev/null 2>> $(PKG_ERROR_LOG)
- @$(RM_F) ./dist/Cordova-${CDV_VER}_temp.dmg
- @# generate sha1
- @openssl sha1 dist/Cordova-${CDV_VER}.dmg > dist/Cordova-${CDV_VER}.dmg.SHA1;
- @# done
- @echo -e "\t\033[32mok.\033[m"
- @echo -e "Build products are in: \033[33m$(PWD)/dist\033[m";
- @make clean
-
-install: installer
- @open dist/files/Cordova-${CDV_VER}.pkg
+install: check-utils clean update-template
+ @defaults write org.apache.cordovalib InstallLocation "$(CORDOVA_LIB)"
+ @# Xcode 4
+ @defaults write com.apple.dt.Xcode IDEApplicationwideBuildSettings -dict-add CORDOVALIB "$(CORDOVA_LIB)"
+ @defaults write com.apple.dt.Xcode IDESourceTreeDisplayNames -dict-add CORDOVALIB ""
+ @# Xcode 3
+ @defaults write com.apple.Xcode PBXApplicationwideBuildSettings -dict-add CORDOVALIB "$(CORDOVA_LIB)"
+ @defaults write com.apple.Xcode PBXSourceTreeDisplayNames -dict-add CORDOVALIB ""
+ @# rename the existing Xcode 4 template
+ @if [ -d $(EXISTING_XCODE4_TEMPLATE) ]; then \
+ @mv $(EXISTING_XCODE4_TEMPLATE) $(RENAMED_XCODE4_TEMPLATE) ; \
+ fi
+ @make clean
uninstall:
- @$(RM_RF) ~/Library/Application\ Support/Developer/Shared/Xcode/Project\ Templates/Cordova
- @$(RM_RF) ~/Library/Developer/Xcode/Templates/Project\ Templates/Application/Cordova-based\ Application.xctemplate
- @read -p "Delete all files in ~/Documents/CordovaLib/?: " ; \
- if [ "$$REPLY" == "y" ]; then \
- $(RM_RF) ~/Documents/CordovaLib/ ; \
- else \
- echo "" ; \
- fi
- @read -p "Delete the Cordova framework /Users/Shared/Cordova/Frameworks/Cordova.framework?: " ; \
- if [ "$$REPLY" == "y" ]; then \
- $(RM_RF) /Users/Shared/Cordova/Frameworks/Cordova.framework/ ; $(RM_RF) ~/Library/Frameworks/Cordova.framework ; \
- else \
- echo "" ; \
- fi
+ @$(RM_RF) ~/Library/Application\ Support/Developer/Shared/Xcode/Project\ Templates/Cordova
+ @$(RM_RF) ~/Library/Developer/Xcode/Templates/Project\ Templates/Application/Cordova-based\ Application.xctemplate
+ @read -p "Delete all files in ~/Documents/CordovaLib/?: " ; \
+ @if [ "$$REPLY" == "y" ]; then \
+ $(RM_RF) ~/Documents/CordovaLib/ ; \
+ else \
+ echo "" ; \
+ fi
+ @read -p "Delete the Cordova framework /Users/Shared/Cordova/Frameworks/Cordova.framework?: " ; \
+ if [ "$$REPLY" == "y" ]; then \
+ $(RM_RF) /Users/Shared/Cordova/Frameworks/Cordova.framework/ ; $(RM_RF) ~/Library/Frameworks/Cordova.framework ; \
+ else \
+ echo "" ; \
+ fi
-check-brew:
- @if [[ ! -e `which brew` ]]; then \
- echo -e '\033[31mError: brew was not found, or not on your path. To install brew, follow the instructions here: https://github.com/mxcl/homebrew/wiki/installation or "make install-brew"\033[m'; exit 1; \
- fi
-
-install-brew:
- @/usr/bin/curl -fsSL https://raw.github.com/mxcl/homebrew/master/Library/Contributions/install_homebrew.rb | /usr/bin/ruby
- @/usr/local/bin/brew update
-
-install-wkhtmltopdf:
- @# download wkhtmltopdf if necessary
- @echo "Downloading http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.9.9-OS-X.i368...";
- @curl -L http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.9.9-OS-X.i368 > wkhtmltopdf_temp;
- @$(MKPATH) wkhtmltopdf;
- @mv wkhtmltopdf_temp wkhtmltopdf/wkhtmltopdf;
- @chmod 755 wkhtmltopdf/wkhtmltopdf;
- @echo "wkhtmltopdf v0.9.9 downloaded."
-
-check-wkhtmltopdf:
- @if [[ ! -d "wkhtmltopdf" ]]; then \
- echo -e '\033[31mError: wkhtmltopdf was not found, or not on your path. To install wkhtmltopdf, download and install v0.9.9 by running the command "make install-wkhtmltopdf"\033[m'; exit 1;\
- fi
-
-check-markdown: check-brew
- @if [[ ! -e `which markdown` ]]; then \
- echo -e '\033[31mError: markdown was not found, or not on your path. To install markdown, Install it from homebrew: "brew install markdown" or "make install-markdown"\033[m'; exit 1; \
- fi
-
-install-markdown: check-brew
- @brew install markdown
-
-md-to-html: check-markdown
- @mkdir -p CordovaInstaller/docs
- @# generate readme html from markdown
- @echo '<html><body style="font-family: Helvetica Neue; font-size:10pt;">' > CordovaInstaller/docs/readme.html
- @$(MARKDOWN) README.md >> CordovaInstaller/docs/readme.html
- @echo '</body></html>' >> CordovaInstaller/docs/readme.html
- @# generate 'Cordova Plugin Upgrade Guide' html from markdown
- @echo '<html><body style="font-family: Helvetica Neue;font-size:10pt;">' > CordovaInstaller/docs/plugin_upgrade.html
- @$(MARKDOWN) 'guides/Cordova Plugin Upgrade Guide.md' >> CordovaInstaller/docs/plugin_upgrade.html
- @echo '</body></html>' >> CordovaInstaller/docs/plugin_upgrade.html
- @# generate 'Cordova Settings File' html from markdown
- @echo '<html><body style="font-family: Helvetica Neue;font-size:10pt;">' > CordovaInstaller/docs/settings_file.html
- @$(MARKDOWN) 'guides/Cordova Settings File.md' >> CordovaInstaller/docs/settings_file.html
- @echo '</body></html>' >> CordovaInstaller/docs/settings_file.html
- @# generate 'Cordova JavaScript Exception Logging' html from markdown
- @echo '<html><body style="font-family: Helvetica Neue;font-size:10pt;">' > CordovaInstaller/docs/exception_logging.html
- @$(MARKDOWN) 'guides/Cordova JavaScript Exception Logging.md' >> CordovaInstaller/docs/exception_logging.html
- @echo '</body></html>' >> CordovaInstaller/docs/exception_logging.html
- @# generate 'Cordova Custom URL Scheme Handling' html from markdown
- @echo '<html><body style="font-family: Helvetica Neue;font-size:10pt;">' > CordovaInstaller/docs/custom_url_scheme.html
- @$(MARKDOWN) 'guides/Cordova Custom URL Scheme Handling.md' >> CordovaInstaller/docs/custom_url_scheme.html
- @echo '</body></html>' >> CordovaInstaller/docs/custom_url_scheme.html
+update-template:
+ @$(RM_F) bin/templates/project/www/cordova-*.js
+ @$(CP) -f CordovaLib/javascript/cordova.ios.js bin/templates/project/www/cordova-$(CDV_VER).js
+ @find "bin/templates/project/www/index.html" | xargs grep 'src[ ]*=[ ]*[\\'\"]cordova-*.*.js[\\'\"]' -sl | xargs -L1 sed -i "" "s/src[ ]*=[ ]*[\\'\"]cordova-*.*.js[\\'\"]/src=\"cordova-${CDV_VER}.js\"/g"