diff options
author | Rod Vagg <rod@vagg.org> | 2015-06-10 17:05:26 +1000 |
---|---|---|
committer | Rod Vagg <rod@vagg.org> | 2015-06-25 15:22:27 +1000 |
commit | dcbb9e1da65ac16e8ed783d0b2b82ad6c7de8dbc (patch) | |
tree | 4c449f742eee5542f73ddd02c191e50c8167f6b8 /tools | |
parent | 8e9089ac3574682bac610b4b7a93a7915ad5ab8d (diff) | |
download | android-node-v8-dcbb9e1da65ac16e8ed783d0b2b82ad6c7de8dbc.tar.gz android-node-v8-dcbb9e1da65ac16e8ed783d0b2b82ad6c7de8dbc.tar.bz2 android-node-v8-dcbb9e1da65ac16e8ed783d0b2b82ad6c7de8dbc.zip |
build: update build targets for io.js
PR-URL: https://github.com/nodejs/io.js/pull/1938
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/msvs/msi/nodemsi.wixproj | 18 | ||||
-rwxr-xr-x | tools/msvs/msi/product.wxs | 4 | ||||
-rw-r--r-- | tools/osx-codesign.sh | 3 | ||||
-rw-r--r-- | tools/osx-pkg.pmdoc/01local.xml | 26 | ||||
-rw-r--r-- | tools/osx-pkg.pmdoc/02npm.xml | 25 | ||||
-rw-r--r-- | tools/osx-pkg.pmdoc/index.xml.tmpl | 42 | ||||
-rw-r--r-- | tools/osx-productsign.sh | 2 |
7 files changed, 101 insertions, 19 deletions
diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj index 4ca4d55682..03192bb1bc 100644 --- a/tools/msvs/msi/nodemsi.wixproj +++ b/tools/msvs/msi/nodemsi.wixproj @@ -6,7 +6,7 @@ <ProductVersion>3.5</ProductVersion> <ProjectGuid>{1d808ff0-b5a9-4be9-859d-b334b6f48be2}</ProjectGuid> <SchemaVersion>2.0</SchemaVersion> - <OutputName>iojs-v$(NodeVersion)-$(Platform)</OutputName> + <OutputName>iojs-v$(FullVersion)-$(Platform)</OutputName> <OutputType>Package</OutputType> <EnableProjectHarvesting>True</EnableProjectHarvesting> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> @@ -14,25 +14,25 @@ <NodeVersion Condition=" '$(NodeVersion)' == '' ">0.0.0.0</NodeVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> - <OutputPath>..\..\..\$(Configuration)\</OutputPath> + <OutputPath>..\..\..\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> - <OutputPath>..\..\..\$(Configuration)\</OutputPath> + <OutputPath>..\..\..\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFilesFolder</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> - <OutputPath>..\..\..\$(Configuration)\</OutputPath> + <OutputPath>..\..\..\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants> <Cultures>en-US</Cultures> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> - <OutputPath>..\..\..\$(Configuration)\</OutputPath> + <OutputPath>..\..\..\</OutputPath> <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> - <DefineConstants>Debug;ProductVersion=$(NodeVersion);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants> + <DefineConstants>Debug;ProductVersion=$(NodeVersion);FullVersion=$(FullVersion);DistTypeDir=$(DistTypeDir);NoETW=$(NoETW);NoPerfCtr=$(NoPerfCtr);NpmSourceDir=..\..\..\deps\npm\;ProgramFilesFolderId=ProgramFiles64Folder</DefineConstants> </PropertyGroup> <PropertyGroup> <EnableProjectHarvesting>True</EnableProjectHarvesting> diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index 6ba74cb450..c90f77ce54 100755 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -85,7 +85,7 @@ <Feature Level="1" Id="DocumentationShortcuts" Title="Online documentation shortcuts" - Description="Add start menu entries that link the the online documentation for io.js $(var.ProductVersion) and the io.js website."> + Description="Add start menu entries that link the the online documentation for io.js v$(var.FullVersion) and the io.js website."> <ComponentRef Id="DocumentationShortcuts"/> </Feature> @@ -225,7 +225,7 @@ Type="url"/> <util:InternetShortcut Id="DocsShortcut" Name="io.js documentation" - Target="https://iojs.org/dist/v$(var.ProductVersion)/doc/api/" + Target="https://iojs.org/download/$(var.DistTypeDir)/v$(var.FullVersion)/doc/api/" Type="url"/> </Component> </DirectoryRef> diff --git a/tools/osx-codesign.sh b/tools/osx-codesign.sh index 65a8d48b8a..5c2d1aff34 100644 --- a/tools/osx-codesign.sh +++ b/tools/osx-codesign.sh @@ -3,10 +3,9 @@ set -x set -e -if ! [ -n "$SIGN" ] && [ $STEP -eq 1 ]; then +if [ "X$SIGN" == "X" ]; then echo "No SIGN environment var. Skipping codesign." >&2 exit 0 fi codesign -s "$SIGN" "$PKGDIR"/usr/local/bin/node -codesign -s "$SIGN" "$PKGDIR"/32/usr/local/bin/node diff --git a/tools/osx-pkg.pmdoc/01local.xml b/tools/osx-pkg.pmdoc/01local.xml index 1d99404e49..4b09310659 100644 --- a/tools/osx-pkg.pmdoc/01local.xml +++ b/tools/osx-pkg.pmdoc/01local.xml @@ -1 +1,25 @@ -<pkgref spec="1.12" uuid="053587FE-BDF3-4EF5-815D-281427431048"><config><identifier>org.iojs.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../out/dist-osx/usr/local/</installFrom><installTo mod="true" relocatable="true">/usr/local</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.isRelativeType</mod><mod>installTo</mod><mod>locationType</mod><mod>relocatable</mod><mod>installFrom.path</mod><mod>installTo.isAbsoluteType</mod><mod>identifier</mod><mod>parent</mod><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod></config></pkgref> +<pkgref spec="1.12" uuid="053587FE-BDF3-4EF5-815D-281427431048"> + <config> + <identifier>org.iojs.iojs.pkg</identifier> + <version>1.0</version> + <description></description> + <post-install type="none"/> + <requireAuthorization/> + <installFrom relative="true" mod="true">../out/dist-osx/usr/local/</installFrom> + <installTo mod="true" relocatable="true">/usr/local</installTo> + <flags> + <followSymbolicLinks/> + </flags> + <packageStore type="internal"></packageStore> + <mod>installTo.isRelativeType</mod> + <mod>installTo</mod> + <mod>locationType</mod> + <mod>relocatable</mod> + <mod>installFrom.path</mod> + <mod>installTo.isAbsoluteType</mod> + <mod>identifier</mod> + <mod>parent</mod> + <mod>installTo.path</mod> + <mod>installFrom.isRelativeType</mod> + </config> +</pkgref> diff --git a/tools/osx-pkg.pmdoc/02npm.xml b/tools/osx-pkg.pmdoc/02npm.xml index 06360b5df9..b9c82e9d95 100644 --- a/tools/osx-pkg.pmdoc/02npm.xml +++ b/tools/osx-pkg.pmdoc/02npm.xml @@ -1 +1,24 @@ -<pkgref spec="1.12" uuid="DF0233A3-6B5D-4FBF-8048-8FC57F42278F"><config><identifier>org.iojs.npm.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true">../deps/npm</installFrom><installTo mod="true">/usr/local/lib/node_modules/npm</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod><mod>installTo</mod><mod>scripts.postinstall.isRelativeType</mod><mod>parent</mod><mod>installTo.isAbsoluteType</mod></config><scripts><postinstall relative="true" mod="true">osx-pkg-postinstall.sh</postinstall></scripts></pkgref> +<pkgref spec="1.12" uuid="DF0233A3-6B5D-4FBF-8048-8FC57F42278F"> + <config> + <identifier>org.iojs.npm.pkg</identifier> + <version>1.0</version> + <description></description> + <post-install type="none"/> + <requireAuthorization/> + <installFrom relative="true">../deps/npm</installFrom> + <installTo mod="true">/usr/local/lib/node_modules/npm</installTo> + <flags> + <followSymbolicLinks/> + </flags> + <packageStore type="internal"></packageStore> + <mod>installTo.path</mod> + <mod>installFrom.isRelativeType</mod> + <mod>installTo</mod> + <mod>scripts.postinstall.isRelativeType</mod> + <mod>parent</mod> + <mod>installTo.isAbsoluteType</mod> + </config> + <scripts> + <postinstall relative="true" mod="true">osx-pkg-postinstall.sh</postinstall> + </scripts> +</pkgref> diff --git a/tools/osx-pkg.pmdoc/index.xml.tmpl b/tools/osx-pkg.pmdoc/index.xml.tmpl index 7376a9d376..1be73d27bc 100644 --- a/tools/osx-pkg.pmdoc/index.xml.tmpl +++ b/tools/osx-pkg.pmdoc/index.xml.tmpl @@ -1,9 +1,35 @@ -<pkmkdoc spec="1.12"><properties><title>io.js</title><build>/Users/iojs/Desktop/iojs.pkg</build><organization>org.iojs</organization><userSees ui="both"/><min-target os="3"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="io.js" id="choice3" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.iojs.pkg"/></choice><choice title="npm" id="choice4" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.iojs.npm.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" mod="true" type="background">../doc/osx_installer_logo.png</resource><resource relative="true" mod="true" type="license">../LICENSE</resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +<pkmkdoc spec="1.12"> + <properties> + <title>io.js</title> + <build>/Users/iojs/Desktop/iojs.pkg</build> + <organization>org.iojs</organization> + <userSees ui="both"/> + <min-target os="3"/> + <domain system="true"/> + </properties> + <distribution> + <versions min-spec="1.000000"/> + <scripts></scripts> + </distribution> + <contents> + <choice title="io.js" id="choice1" starts_selected="true" starts_enabled="true" starts_hidden="false"> + <pkgref id="org.iojs.iojs.pkg"/> + </choice> + <choice title="npm" id="choice2" starts_selected="true" starts_enabled="true" starts_hidden="false"> + <pkgref id="org.iojs.npm.pkg"/> + </choice> + </contents> + <resources bg-scale="none" bg-align="topleft"> + <locale lang="en"> + <resource relative="true" mod="true" type="background">../doc/osx_installer_logo.png</resource> + <resource relative="true" mod="true" type="license">../LICENSE</resource> + <resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural -\f0\fs26 \cf0 This package will install io.js __iojsversion__ and npm __npmversion__ into /usr/local/. The binary /usr/local/bin/iojs will also be symlinked as /usr/local/bin/node.}]]></resource><resource mime-type="text/rtf" kind="embedded" type="conclusion"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 +\f0\fs26 \cf0 This package will install io.js {iojsversion} and npm {npmversion} into /usr/local/. The binary /usr/local/bin/iojs will also be symlinked as /usr/local/bin/node.}]]></resource> + <resource mime-type="text/rtf" kind="embedded" type="conclusion"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural @@ -18,4 +44,14 @@ npm was installed at\ \ /usr/local/bin/npm\ \ -Make sure that /usr/local/bin is in your $PATH.}]]></resource></locale></resources><flags/><item type="file">01local.xml</item><item type="file">02npm.xml</item><mod>properties.title</mod><mod>properties.userDomain</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc> +Make sure that /usr/local/bin is in your $PATH.}]]></resource> + </locale> + </resources> + <flags/> + <item type="file">01local.xml</item> + <item type="file">02npm.xml</item> + <mod>properties.title</mod> + <mod>properties.userDomain</mod> + <mod>properties.anywhereDomain</mod> + <mod>properties.systemDomain</mod> +</pkmkdoc> diff --git a/tools/osx-productsign.sh b/tools/osx-productsign.sh index 4834c9bbb8..491e3fde62 100644 --- a/tools/osx-productsign.sh +++ b/tools/osx-productsign.sh @@ -3,7 +3,7 @@ set -x set -e -if ! [ -n "$SIGN" ]; then +if [ "X$SIGN" == "X" ]; then echo "No SIGN environment var. Skipping codesign." >&2 exit 0 fi |