New bundle : 8.2.1 (Issue neard/neard#300)

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## r15 (2017/07/30)
+
+* New bundle : 8.2.1 (Issue crazy-max/neard#300)
+
 ## r14 (2017/07/13)
 
 * New bundles : 4.8.4, 6.11.1, 7.10.1, 8.1.4 (Issue crazy-max/neard#285)

README.md

@@ -1,7 +1,7 @@
 [![GitHub release](https://img.shields.io/github/release/crazy-max/neard-bin-nodejs.svg?style=flat-square)](https://github.com/crazy-max/neard-bin-nodejs/releases/latest)
 ![Total downloads](https://img.shields.io/github/downloads/crazy-max/neard-bin-nodejs/total.svg?style=flat-square)
 
-This is a module of [Neard project](https://github.com/crazy-max/neard) involving Node.js binary bundles.
+This is a module of [Neard project](https://github.com/crazy-max/neard) involving Node.js.
 
 ## Documentation and downloads
 

bin/nodejs8.2.1/etc/.npmignore

@@ -0,0 +1 @@
+

bin/nodejs8.2.1/etc/npmrc

@@ -0,0 +1,5 @@
+cache = ~NEARD_WIN_PATH~\tmp\npm-cache
+globalconfig = ~NEARD_WIN_PATH~\bin\nodejs\nodejs8.2.1\etc\npmrc
+globalignorefile = ~NEARD_WIN_PATH~\bin\nodejs\nodejs8.2.1\etc\.npmignore
+init-module = ~NEARD_WIN_PATH~\bin\nodejs\nodejs8.2.1\etc\.npm-init.js
+userconfig = ~NEARD_WIN_PATH~\bin\nodejs\nodejs8.2.1\etc\npmrc

bin/nodejs8.2.1/etc/npmrc.nrd

@@ -0,0 +1,5 @@
+cache = ~NEARD_WIN_PATH~\tmp\npm-cache
+globalconfig = ~NEARD_WIN_PATH~\bin\nodejs\nodejs8.2.1\etc\npmrc
+globalignorefile = ~NEARD_WIN_PATH~\bin\nodejs\nodejs8.2.1\etc\.npmignore
+init-module = ~NEARD_WIN_PATH~\bin\nodejs\nodejs8.2.1\etc\.npm-init.js
+userconfig = ~NEARD_WIN_PATH~\bin\nodejs\nodejs8.2.1\etc\npmrc

bin/nodejs8.2.1/launch.bat

@@ -0,0 +1,12 @@
+@ECHO OFF
+SETLOCAL EnableDelayedExpansion
+
+SET NEARD_NODEJS_PATH=%~dp0
+SET NEARD_NODEJS_PATH=!NEARD_NODEJS_PATH:~0,-1!
+SET NEARD_NODEJS_NPM_PATH=%NEARD_NODEJS_PATH%\node_modules\npm
+SET NEARD_NODEJS_CONFIG_PATH=%NEARD_NODEJS_NPM_PATH%\npmrc
+ECHO prefix = %NEARD_NODEJS_PATH%>%NEARD_NODEJS_CONFIG_PATH%
+
+"%NEARD_NODEJS_PATH%\nodevars.bat" & "%NEARD_NODEJS_PATH%\npm" config set globalconfig "%NEARD_NODEJS_CONFIG_PATH%" --global
+
+ENDLOCAL

bin/nodejs8.2.1/neard.conf

@@ -0,0 +1,8 @@
+nodejsVersion = "8.2.1"
+nodejsExe = "node.exe"
+nodejsVars = "nodevars.bat"
+nodejsNpm = "npm.cmd"
+nodejsLaunch = "launch.bat"
+nodejsConf = "node_modules/npm/npmrc"
+
+bundleRelease = "@RELEASE_VERSION@"

build.properties

@@ -1,5 +1,5 @@
 bundle.name = nodejs
-bundle.release = r14
+bundle.release = r15
 bundle.type = bins
 bundle.format = 7z
 

build.xml

@@ -21,16 +21,23 @@
     <replaceproperty src="bundle.folder" dest="bundle.version" replace="${bundle.name}" with=""/>
 
     <getmoduleuntouched name="${bundle.name}" version="${bundle.version}" propSrcDest="bundle.srcdest" propSrcFilename="bundle.srcfilename"/>
-    <assertfile file="${bundle.srcdest}/${bundle.srcfilename}"/>
-
-    <property name="msiextract.path" value="${bundle.srcdest}/extract"/>
-    <extractmsi file="${bundle.srcdest}/${bundle.srcfilename}" dest="${msiextract.path}"/>
-    <assertfile file="${msiextract.path}/nodejs/node.exe"/>
+    <if>
+      <matches string="${bundle.srcdest}/${bundle.srcfilename}" pattern="msi$"/>
+      <then>
+        <extractmsi file="${bundle.srcdest}/${bundle.srcfilename}" dest="${bundle.srcdest}/extract"/>
+        <property name="nodeextract.path" value="${bundle.srcdest}/extract/SourceDir/nodejs"/>
+      </then>
+      <else>
+        <propertyregex property="bundle.srcbasename" input="${bundle.srcfilename}" regexp="(.*)\.(.*)" select="\1"/>
+        <property name="nodeextract.path" value="${bundle.srcdest}/${bundle.srcbasename}"/>
+      </else>
+    </if>
+    <assertfile file="${nodeextract.path}/node.exe"/>
 
     <delete dir="${bundle.tmp.prep.path}/${bundle.folder}"/>
     <mkdir dir="${bundle.tmp.prep.path}/${bundle.folder}"/>
     <copy todir="${bundle.tmp.prep.path}/${bundle.folder}" overwrite="true">
-      <fileset dir="${msiextract.path}/nodejs"/>
+      <fileset dir="${nodeextract.path}"/>
     </copy>
     <copy todir="${bundle.tmp.prep.path}/${bundle.folder}" overwrite="true">
       <fileset dir="${bundle.path}" defaultexcludes="yes"/>

releases.properties

@@ -51,3 +51,4 @@
 7.10.1 = https://github.com/crazy-max/neard-bin-nodejs/releases/download/r14/neard-nodejs-7.10.1-r14.7z
 8.1.0 = https://github.com/crazy-max/neard-bin-nodejs/releases/download/r13/neard-nodejs-8.1.0-r13.7z
 8.1.4 = https://github.com/crazy-max/neard-bin-nodejs/releases/download/r14/neard-nodejs-8.1.4-r14.7z
+8.2.1 = https://github.com/crazy-max/neard-bin-nodejs/releases/download/r15/neard-nodejs-8.2.1-r15.7z