Skip to content

Commit

Permalink
feat: add enviroments in jni keys
Browse files Browse the repository at this point in the history
  • Loading branch information
numandev1 committed Jan 12, 2021
1 parent ce12861 commit 0d7e064
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 20 deletions.
4 changes: 2 additions & 2 deletions jniAndroid.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const {
getJniKeys,
makeFileInAndroidDir,
makeFileInAndroidForBridgeJniDir,
getAndroidEnviromentFile
getAndroidEnviromentFile,
} = require('./src/util/common');
const {
makeCppFileTemplateAndroid,
Expand All @@ -13,7 +13,7 @@ const {
} = require('./src/util/jniFilesTemplateAndroid');

const makeAndroidJnuFiles = () => {
const JNI_FILE_NAME=getAndroidEnviromentFile();
const JNI_FILE_NAME = getAndroidEnviromentFile();
const secureKeys = getJniKeys(JNI_FILE_NAME);
const stringifyKeys = JSON.stringify(secureKeys);
const cppFileContent = makeCppFileTemplateAndroid(
Expand Down
5 changes: 2 additions & 3 deletions jniIOS.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@ const {
getJniKeys,
makeFileInIosDir,
makeEncryptionFile,
getIosEnviromentFile
getIosEnviromentFile,
} = require('./src/util/common');
const {
makeCppFileTemplateIOS,
makeHppFileTemplateIOS,
makeJniKeysPackageMMTemplateIOS,
} = require('./src/util/jniFilesTemplateIos');


const makeIosJnuFiles = () => {
const JNI_FILE_NAME=getIosEnviromentFile();
const JNI_FILE_NAME = getIosEnviromentFile();
const secureKeys = getJniKeys(JNI_FILE_NAME);
const stringifyKeys = JSON.stringify(secureKeys);
const cppFileContent = makeCppFileTemplateIOS(
Expand Down
24 changes: 9 additions & 15 deletions src/util/common.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const fs = require('fs-extra');
const path = require('path');
const DEFAULT_FILE_NAME="jnikeys.json";
const DEFAULT_FILE_NAME = 'jnikeys.json';
const PROJECT_ROOT_DIR_PATH = path.join(__dirname, '../../../../');
const PACKAGE_ROOT_DIR_PATH = path.join(__dirname, '../../');
const IOS_DIR_PATH = path.join(
Expand Down Expand Up @@ -60,19 +60,14 @@ module.exports.makeFileInAndroidDir = (fileContent, fileName) => {

module.exports.getIosEnviromentFile = () => {
try {
let JNI_FILE_NAME=process.env.JNIFILE;
if(JNI_FILE_NAME)
{
let JNI_FILE_NAME = process.env.JNIFILE;
if (JNI_FILE_NAME) {
return JNI_FILE_NAME;
}
else if(process.env.CONFIGURATION==="Debug")
{
const debugFile=process.env.DEBUG_JNIFILE||DEFAULT_FILE_NAME;
} else if (process.env.CONFIGURATION === 'Debug') {
const debugFile = process.env.DEBUG_JNIFILE || DEFAULT_FILE_NAME;
return debugFile;
}
else if(process.env.CONFIGURATION==="Release")
{
const debugFile=process.env.RELEASE_JNIFILE||DEFAULT_FILE_NAME;
} else if (process.env.CONFIGURATION === 'Release') {
const debugFile = process.env.RELEASE_JNIFILE || DEFAULT_FILE_NAME;
return debugFile;
}
return DEFAULT_FILE_NAME;
Expand All @@ -83,9 +78,8 @@ module.exports.getIosEnviromentFile = () => {

module.exports.getAndroidEnviromentFile = () => {
try {
let JNI_FILE_NAME=process.env.JNIFILE;
if(JNI_FILE_NAME)
{
let JNI_FILE_NAME = process.env.JNIFILE;
if (JNI_FILE_NAME) {
return JNI_FILE_NAME;
}
return DEFAULT_FILE_NAME;
Expand Down

0 comments on commit 0d7e064

Please sign in to comment.