This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new c450403  try to fold in latest NPM info
c450403 is described below

commit c450403a483b55a27265462588f08eb02d329cb9
Author: Alex Harui <[email protected]>
AuthorDate: Wed Feb 7 12:07:31 2018 -0800

    try to fold in latest NPM info
---
 README.md            | 13 +++++++++++--
 releasecandidate.xml | 44 +++++++++++++++++++++++---------------------
 releasemgr/README    | 12 ++++++++++--
 3 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index cdd80df..301b081 100644
--- a/README.md
+++ b/README.md
@@ -181,13 +181,22 @@ If you want SWF output, use NPM. Run:
 
 - Mac
 ```bash
-sudo npm install apache-royale -g
+sudo npm install @apache-royale/royale-js -g
 ```
+or for both JS and SWF output:
+
+```bash
+sudo npm install @apache-royale/royale-js-swf -g
 
 - Windows
 ```bash
-npm install apache-royale -g
+npm install @apache-royale/royale-js -g
 ```
+or for both JS and SWF output:
+```bash
+npm install @apache-royale/royale-js-swf -g
+```
+
 
 # Using Royale
 
diff --git a/releasecandidate.xml b/releasecandidate.xml
index 35fe1d3..bd59ffe 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -1095,7 +1095,7 @@ ${my.name}
         <antcall target="update.versions" />
         <antcall target="merge_rc_to_develop" />
         <antcall target="release.maven.staging.repo" />
-        <echo>Also run the release.npm and release.npm.swf targets</echo>
+        <echo>Also run the release.npm target</echo>
        </target>
 
     <target name="release.tag" depends="check-royale-asjs, 
check-royale-typedefs, check-royale-compiler">
@@ -1167,7 +1167,10 @@ ${my.name}
         <replace file="${asjs}/package.json"
             token="version&quot;: &quot;${release.version}"
             value="version&quot;: &quot;${new.release.version}" />
-        <replace file="${asjs}/npm/package.json"
+        <replace file="${asjs}/npm/js-only/package.json"
+            token="version&quot;: &quot;${release.version}"
+            value="version&quot;: &quot;${new.release.version}" />
+            <replace file="${asjs}/npm/js-swf/package.json"
             token="version&quot;: &quot;${release.version}"
             value="version&quot;: &quot;${new.release.version}" />
         <replace
@@ -1342,23 +1345,9 @@ ${my.name}
 
     <target name="release.npm" depends="check-name-and-svn">
         <input
-        message="To publish the npm artifacts, you must first run 'npm login' 
and login as apache-royale with the password from the private@ list and the 
email [email protected].  Press any key to continue"/>
-        <available file="${svn.dist.release}"
-        type="dir"
-        property="dist.release" value="${svn.dist.release}" />
-        
-        <fail message="The svn.dist.release property is not set to the working 
copy for https://dist.apache.org/repos/dist/release.";
-        unless="dist.release"/>
+        message="To publish the npm artifacts, enter the npm password from the 
private@ list"
+        addproperty="npm.password"/>
         
-        <exec executable="npm" failonerror="true">
-            <arg value="publish" />
-            <arg 
value="${dist.release}/royale/${release.version}/binaries/apache-royale-${release.version}-bin-js.tar.gz"
 />
-        </exec>
-    </target>
-    
-    <target name="release.npm.swf" depends="check-name-and-svn">
-        <input
-        message="To publish the npm artifacts, you must first run 'npm login' 
and login as apache-royale-swf with the password from the private@ list and the 
email [email protected].  Press any key to continue"/>
         <available file="${svn.dist.release}"
         type="dir"
         property="dist.release" value="${svn.dist.release}" />
@@ -1366,9 +1355,22 @@ ${my.name}
         <fail message="The svn.dist.release property is not set to the working 
copy for https://dist.apache.org/repos/dist/release.";
         unless="dist.release"/>
         
-        <exec executable="npm" failonerror="true">
-            <arg value="publish" />
-            <arg 
value="${dist.release}/royale/${release.version}/binaries/apache-royale-${release.version}-bin-js-swf.tar.gz"
 />
+        <exec executable="npm" dir="${asjs}/npm/release-scripts" 
failonerror="true">
+            <arg value="install" />
+        </exec>
+        <exec executable="node" dir="${asjs}/npm/release-scripts" 
failonerror="true">
+            <arg value="publish.js" />
+            <arg value="--type=js-only" />
+            <arg 
value="--pathToTarball=${dist.release}/royale/${release.version}/binaries/apache-royale-${release.version}-bin-js.tar.gz"
 />
+            <arg value="--username=apache-royale-owner" />
+            <arg value="--password=${npm.password}" />
+        </exec>
+        <exec executable="node" dir="${asjs}/npm/release-scripts" 
failonerror="true">
+            <arg value="publish.js" />
+            <arg value="--type=js-swf" />
+            <arg 
value="--pathToTarball=${dist.release}/royale/${release.version}/binaries/apache-royale-${release.version}-bin-js-swf.tar.gz"
 />
+            <arg value="--username=apache-royale-owner" />
+            <arg value="--password=${npm.password}" />
         </exec>
     </target>
 
diff --git a/releasemgr/README b/releasemgr/README
index c3bdad9..1d4bf90 100644
--- a/releasemgr/README
+++ b/releasemgr/README
@@ -191,11 +191,19 @@ You can use NPM to get a pre-built package.  To do so run:
 
 On Mac:
 
-  sudo npm install royale -g
+  sudo npm install @apache-royale/royale-js -g
+
+or for both JS and SWF output:
+
+  sudo npm install @apache-royale/royale-js-swf -g
 
 On Windows:
 
-  npm install royale -g
+  npm install @apache-royale/royale-js -g
+
+or for both JS and SWF output:
+
+  npm install @apache-royale/royale-js-swf -g
 
 
 Using Royale

-- 
To stop receiving notification emails like this one, please contact
[email protected].

Reply via email to