Merge pull request #1634 from ProfoundLogic/master

implausible · web-flow · commit 6e0fb0e80b9c · 2019-02-19T15:40:04.000-07:00
Add support for building on IBM i (PASE)
diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
@@ -1,6 +1,7 @@
 {
   "variables": {
-    "is_electron%": "<!(node ./utils/isBuildingForElectron.js <(node_root_dir))"
+    "is_electron%": "<!(node ./utils/isBuildingForElectron.js <(node_root_dir))",
+    "is_IBMi%": "<!(node ./utils/isBuildingForIBMi.js)"
   },
 
   "targets": [
@@ -153,19 +154,29 @@
           }
         ],
         [
-          "OS=='linux' or OS.endswith('bsd')", {
+          "OS=='linux' or OS.endswith('bsd') or <(is_IBMi) == 1", {
             "cflags": [
               "-std=c++11"
             ]
           }
         ],
         [
-          "OS.endswith('bsd') or (<(is_electron) == 1 and OS=='linux')", {
+          "OS.endswith('bsd') or (<(is_electron) == 1 and OS=='linux') or <(is_IBMi) == 1", {
             "libraries": [
               "-lcrypto",
               "-lssl"
             ],
           }
+        ],
+        [
+          "<(is_IBMi) == 1", {
+            "include_dirs": [
+              "/QOpenSys/pkgs/include"
+            ],
+            "libraries": [
+              "-L/QOpenSys/pkgs/lib"
+            ]
+          }
         ]
       ]
     }
diff --git a/utils/isBuildingForIBMi.js b/utils/isBuildingForIBMi.js
@@ -0,0 +1,4 @@
+const os = require("os");
+const isIBMi = (os.platform() == "aix" && os.type() == "OS400");
+
+process.stdout.write(isIBMi ? "1" : "0");
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
@@ -8,7 +8,8 @@
     "openssl_enable_asm%": 0, # only supported with the Visual Studio 2012 (VC11) toolchain.
     "gcc_version%": 0,
     "is_electron%": "<!(node ../utils/isBuildingForElectron.js <(node_root_dir))",
-    "is_clang%": 0
+    "is_clang%": 0,
+    "is_IBMi%": "<!(node ../utils/isBuildingForIBMi.js)"
   },
   "targets": [
     {
@@ -323,7 +324,7 @@
                 }
             }
         }],
-        ["OS=='mac' or OS=='linux' or OS.endswith('bsd')", {
+        ["OS=='mac' or OS=='linux' or OS.endswith('bsd') or <(is_IBMi) == 1", {
           "defines": [
             "GIT_SHA1_OPENSSL"
           ],
@@ -333,7 +334,7 @@
             "libgit2/src/streams/tls.h"
           ]
         }],
-        ["OS=='linux' or OS.endswith('bsd')" , {
+        ["OS=='linux' or OS.endswith('bsd') or <(is_IBMi) == 1", {
           "cflags": [
             "-DGIT_SSH",
             "-DGIT_SSL",
@@ -344,6 +345,11 @@
             "GIT_USE_STAT_MTIM"
           ]
         }],
+        ["<(is_IBMi) == 1", {
+          "include_dirs": [
+            "/QOpenSys/pkgs/include",
+          ]
+        }],
         ["OS=='win'", {
           "defines": [
             "GIT_WINHTTP",
@@ -582,6 +588,11 @@
             ]
           }
         }],
+        ["<(is_IBMi) == 1", {
+          "include_dirs": [
+            "/QOpenSys/pkgs/include"
+          ]
+        }],
       ]
     }
   ]

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"variables": {`
`3`		`- "is_electron%": "<!(node ./utils/isBuildingForElectron.js <(node_root_dir))"`
	`3`	`+ "is_electron%": "<!(node ./utils/isBuildingForElectron.js <(node_root_dir))",`
	`4`	`+ "is_IBMi%": "<!(node ./utils/isBuildingForIBMi.js)"`
`4`	`5`	`},`
`5`	`6`
`6`	`7`	`"targets": [`
`@@ -153,19 +154,29 @@`
`153`	`154`	`}`
`154`	`155`	`],`
`155`	`156`	`[`
`156`		`- "OS=='linux' or OS.endswith('bsd')", {`
	`157`	`+ "OS=='linux' or OS.endswith('bsd') or <(is_IBMi) == 1", {`
`157`	`158`	`"cflags": [`
`158`	`159`	`"-std=c++11"`
`159`	`160`	`]`
`160`	`161`	`}`
`161`	`162`	`],`
`162`	`163`	`[`
`163`		`- "OS.endswith('bsd') or (<(is_electron) == 1 and OS=='linux')", {`
	`164`	`+ "OS.endswith('bsd') or (<(is_electron) == 1 and OS=='linux') or <(is_IBMi) == 1", {`
`164`	`165`	`"libraries": [`
`165`	`166`	`"-lcrypto",`
`166`	`167`	`"-lssl"`
`167`	`168`	`],`
`168`	`169`	`}`
	`170`	`+ ],`
	`171`	`+ [`
	`172`	`+ "<(is_IBMi) == 1", {`
	`173`	`+ "include_dirs": [`
	`174`	`+ "/QOpenSys/pkgs/include"`
	`175`	`+ ],`
	`176`	`+ "libraries": [`
	`177`	`+ "-L/QOpenSys/pkgs/lib"`
	`178`	`+ ]`
	`179`	`+ }`
`169`	`180`	`]`
`170`	`181`	`]`
`171`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`	`"openssl_enable_asm%": 0, # only supported with the Visual Studio 2012 (VC11) toolchain.`
`9`	`9`	`"gcc_version%": 0,`
`10`	`10`	`"is_electron%": "<!(node ../utils/isBuildingForElectron.js <(node_root_dir))",`
`11`		`- "is_clang%": 0`
	`11`	`+ "is_clang%": 0,`
	`12`	`+ "is_IBMi%": "<!(node ../utils/isBuildingForIBMi.js)"`
`12`	`13`	`},`
`13`	`14`	`"targets": [`
`14`	`15`	`{`
`@@ -323,7 +324,7 @@`
`323`	`324`	`}`
`324`	`325`	`}`
`325`	`326`	`}],`
`326`		`- ["OS=='mac' or OS=='linux' or OS.endswith('bsd')", {`
	`327`	`+ ["OS=='mac' or OS=='linux' or OS.endswith('bsd') or <(is_IBMi) == 1", {`
`327`	`328`	`"defines": [`
`328`	`329`	`"GIT_SHA1_OPENSSL"`
`329`	`330`	`],`
`@@ -333,7 +334,7 @@`
`333`	`334`	`"libgit2/src/streams/tls.h"`
`334`	`335`	`]`
`335`	`336`	`}],`
`336`		`- ["OS=='linux' or OS.endswith('bsd')" , {`
	`337`	`+ ["OS=='linux' or OS.endswith('bsd') or <(is_IBMi) == 1", {`
`337`	`338`	`"cflags": [`
`338`	`339`	`"-DGIT_SSH",`
`339`	`340`	`"-DGIT_SSL",`
`@@ -344,6 +345,11 @@`
`344`	`345`	`"GIT_USE_STAT_MTIM"`
`345`	`346`	`]`
`346`	`347`	`}],`
	`348`	`+ ["<(is_IBMi) == 1", {`
	`349`	`+ "include_dirs": [`
	`350`	`+ "/QOpenSys/pkgs/include",`
	`351`	`+ ]`
	`352`	`+ }],`
`347`	`353`	`["OS=='win'", {`
`348`	`354`	`"defines": [`
`349`	`355`	`"GIT_WINHTTP",`
`@@ -582,6 +588,11 @@`
`582`	`588`	`]`
`583`	`589`	`}`
`584`	`590`	`}],`
	`591`	`+ ["<(is_IBMi) == 1", {`
	`592`	`+ "include_dirs": [`
	`593`	`+ "/QOpenSys/pkgs/include"`
	`594`	`+ ]`
	`595`	`+ }],`
`585`	`596`	`]`
`586`	`597`	`}`
`587`	`598`	`]`