From 7dbd48c91944a9f9f4eafc1222d80a79524ee0f0 Mon Sep 17 00:00:00 2001 From: danilohgds Date: Sat, 14 Apr 2018 01:09:19 -0300 Subject: [PATCH 1/3] Added Support to STAGING file, within windows environments. CYGWIN or GITBASH is needed due to a bug with replace in bat. Signed-off-by: Danilo Henrique Garcia da Silva --- package/MAKEPKG.BAT | 58 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/package/MAKEPKG.BAT b/package/MAKEPKG.BAT index 94f86d47..7d971ce5 100644 --- a/package/MAKEPKG.BAT +++ b/package/MAKEPKG.BAT @@ -38,6 +38,7 @@ if "%1" == "" GOTO usage REM jump to appropriate sections based on if "%1" == "CLEANUP" GOTO cleanup if "%1" == "CREATEBINARY" GOTO createbinary +if "%1" == "CREATESTGBINARY" GOTO createstgbinary goto usage REM cleanup section, remove file(s) created by this batch file @@ -47,6 +48,63 @@ del ..\package-lock.json del SHASUMS256.txt oracledb-v*-node-*.gz goto exit + +REM compile, package to gz file +:createstgbinary +echo "createstgbinary section" + +REM Append SHA to LICENSE.MD +git checkout ..\LICENSE.md +setlocal enabledelayedexpansion +REM compose a string with commands to execute one by one + +REM start with empty string +set CONCAT_STR= +REM capture SHA +FOR /F "tokens=* USEBACKQ" %%F IN (`git --git-dir=..\.git rev-parse HEAD`) DO ( +SET CONCAT_STR=%%F +) + +set DATE_STR= +FOR /F "tokens=* USEBACKQ" %%F IN (`DATE /T`) DO ( SET DATE_STR=%%F ) + +REM append output of other commands +set CMD_STR="git --git-dir=..\odpi\.git rev-parse HEAD && node --version" +for /f %%i in ('%CMD_STR%') do set "CONCAT_STR=!CONCAT_STR! %%i" +set CONCAT_STR=!CONCAT_STR! !DATE_STR! +echo !CONCAT_STR! >> ..\LICENSE.MD + +REM Compile node-oracledb +cd .. +CALL npm install +echo "NODE oracledb compiled" +cd package +echo "==> Staging Binary package created for Node.js " + +Set "hostname=%NODE_ORACLEDB_PACKAGE_HOSTNAME%" +Set "pathname=%NODE_ORACLEDB_PACKAGE_URL_PATH%" +Set "newname=%NODE_PKG_HOSTNAME%" + +sed -i "s|github.com|%hostname%|g" oracledbinstall.js +sed -i "s|/oracle/node-oracledb/releases/download/|%pathname%|g" oracledbinstall.js + +del /S *.gz + +node createpackage.js +xcopy /Y "package.json" "../package.json" +npm pack +Setlocal enabledelayedexpansion + +Set "Pattern=oracledb" +Set "Replace=oracledb-staging" + +For %%a in (*.gz) Do ( + Set "File=%%~a" + Ren "%%a" "!File:%Pattern%=%Replace%!" +) + +goto exit + REM compile, package to gz file :createbinary echo "createbinary section" From 3f26a42c7195367a2ddd83b6bae017a53930d171 Mon Sep 17 00:00:00 2001 From: danilohgds Date: Fri, 20 Apr 2018 13:09:22 -0300 Subject: [PATCH 2/3] . --- LICENSE.md | 1 + package.json | 4 +--- package/oracledbinstall.js | 6 +++--- package/package.json | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 2797c547..316e7016 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -816,3 +816,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` +7dbd48c91944a9f9f4eafc1222d80a79524ee0f0 20/04/2018 diff --git a/package.json b/package.json index 72d8624c..2d35f141 100644 --- a/package.json +++ b/package.json @@ -28,15 +28,13 @@ "type": "git", "url": "git://github.com/oracle/node-oracledb.git" }, - "dependencies": { - "nan": "~2.8.0" - }, "devDependencies": { "mocha": "^2.4.5", "should": "^8.3.1", "async": "^1.5.0" }, "scripts": { + "install": "node package/oracledbinstall.js", "test": "mocha --opts test/opts/mocha.opts", "posttest": "node test/opts/version.js" }, diff --git a/package/oracledbinstall.js b/package/oracledbinstall.js index 3c0e25b9..55eeb672 100644 --- a/package/oracledbinstall.js +++ b/package/oracledbinstall.js @@ -52,9 +52,9 @@ try { // Note: the Makefile uses these hostname and path values for the npm // package but will substitute them for the staging package -const PACKAGE_HOSTNAME = 'github.com'; -const PACKAGE_PATH_REMOTE = '/oracle/node-oracledb/releases/download/' + packageUtil.dynamicProps.GITHUB_TAG + '/' + packageUtil.dynamicProps.PACKAGE_FILE_NAME; -const SHA_PATH_REMOTE = '/oracle/node-oracledb/releases/download/' + packageUtil.dynamicProps.GITHUB_TAG + '/' + packageUtil.SHA_FILE_NAME; +const PACKAGE_HOSTNAME = 'nexus.produbanbr.corp'; +const PACKAGE_PATH_REMOTE = 'C:/Program Files/Git/repository/npm-alm' + packageUtil.dynamicProps.GITHUB_TAG + '/' + packageUtil.dynamicProps.PACKAGE_FILE_NAME; +const SHA_PATH_REMOTE = 'C:/Program Files/Git/repository/npm-alm' + packageUtil.dynamicProps.GITHUB_TAG + '/' + packageUtil.SHA_FILE_NAME; const PORT = 443; // getProxyConfig gets the proxy configuration for a given hostname. Has basic diff --git a/package/package.json b/package/package.json index 2d35f141..46389fc5 100644 --- a/package/package.json +++ b/package/package.json @@ -1,7 +1,7 @@ { "name": "oracledb", - "version": "2.2.0", - "description": "Oracle Database driver by Oracle Corp.", + "version": "2.2.9", + "description": "Oracle Database driver by Oracle Corp. Points to nexus", "license": "Apache-2.0", "homepage": "http://oracle.github.io/node-oracledb/", "keywords": [ From aeeae673639842afabd7d77a8ecbf866484e0014 Mon Sep 17 00:00:00 2001 From: danilohgds Date: Fri, 20 Apr 2018 20:18:09 -0300 Subject: [PATCH 3/3] Revert "." This reverts commit 3f26a42c7195367a2ddd83b6bae017a53930d171. --- LICENSE.md | 1 - package.json | 4 +++- package/oracledbinstall.js | 6 +++--- package/package.json | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 316e7016..2797c547 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -816,4 +816,3 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` -7dbd48c91944a9f9f4eafc1222d80a79524ee0f0 20/04/2018 diff --git a/package.json b/package.json index 2d35f141..72d8624c 100644 --- a/package.json +++ b/package.json @@ -28,13 +28,15 @@ "type": "git", "url": "git://github.com/oracle/node-oracledb.git" }, + "dependencies": { + "nan": "~2.8.0" + }, "devDependencies": { "mocha": "^2.4.5", "should": "^8.3.1", "async": "^1.5.0" }, "scripts": { - "install": "node package/oracledbinstall.js", "test": "mocha --opts test/opts/mocha.opts", "posttest": "node test/opts/version.js" }, diff --git a/package/oracledbinstall.js b/package/oracledbinstall.js index 55eeb672..3c0e25b9 100644 --- a/package/oracledbinstall.js +++ b/package/oracledbinstall.js @@ -52,9 +52,9 @@ try { // Note: the Makefile uses these hostname and path values for the npm // package but will substitute them for the staging package -const PACKAGE_HOSTNAME = 'nexus.produbanbr.corp'; -const PACKAGE_PATH_REMOTE = 'C:/Program Files/Git/repository/npm-alm' + packageUtil.dynamicProps.GITHUB_TAG + '/' + packageUtil.dynamicProps.PACKAGE_FILE_NAME; -const SHA_PATH_REMOTE = 'C:/Program Files/Git/repository/npm-alm' + packageUtil.dynamicProps.GITHUB_TAG + '/' + packageUtil.SHA_FILE_NAME; +const PACKAGE_HOSTNAME = 'github.com'; +const PACKAGE_PATH_REMOTE = '/oracle/node-oracledb/releases/download/' + packageUtil.dynamicProps.GITHUB_TAG + '/' + packageUtil.dynamicProps.PACKAGE_FILE_NAME; +const SHA_PATH_REMOTE = '/oracle/node-oracledb/releases/download/' + packageUtil.dynamicProps.GITHUB_TAG + '/' + packageUtil.SHA_FILE_NAME; const PORT = 443; // getProxyConfig gets the proxy configuration for a given hostname. Has basic diff --git a/package/package.json b/package/package.json index 46389fc5..2d35f141 100644 --- a/package/package.json +++ b/package/package.json @@ -1,7 +1,7 @@ { "name": "oracledb", - "version": "2.2.9", - "description": "Oracle Database driver by Oracle Corp. Points to nexus", + "version": "2.2.0", + "description": "Oracle Database driver by Oracle Corp.", "license": "Apache-2.0", "homepage": "http://oracle.github.io/node-oracledb/", "keywords": [