Skip to content

Commit d1d6bfa

Browse files
committed
Add 32bit windows BNG2 standalone executable
1 parent cd5d423 commit d1d6bfa

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed
7.85 MB
Binary file not shown.

vcell-core/src/main/java/cbit/vcell/resource/ResourceUtil.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,11 @@ public static String getBNG2_perl_file(){
426426
return bng2_path;
427427
}
428428

429-
public static String getBNG2StandaloneWin64(){
430-
return new File(getBNGRoot(),"win64Standalone/BNG2.exe").getAbsolutePath();
429+
public static String getBNG2StandaloneWin(boolean b64bit){
430+
if(b64bit){
431+
return new File(getBNGRoot(),"win64Standalone/BNG2.exe").getAbsolutePath();
432+
}
433+
return new File(getBNGRoot(),"win32Standalone/BNG2_32bit.exe").getAbsolutePath();
431434
}
432435

433436
public static File getVCellInstall()

vcell-core/src/main/java/cbit/vcell/server/bionetgen/BNGExecutorServiceNative.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ public BNGOutput executeBNG() throws BNGException {
116116

117117
String[] cmd = null;
118118
OperatingSystemInfo osi = OperatingSystemInfo.getInstance( );
119-
if(osi.isWindows() && osi.is64bit()){
120-
System.out.println("BNGExecutorService.executeBNG() as standalone executable\n");
121-
cmd = new String[] {ResourceUtil.getBNG2StandaloneWin64(), bngInputFile.getAbsolutePath()};
119+
if(osi.isWindows()){
120+
System.out.println("BNGExecutorService.executeBNG() "+(osi.is64bit()?"64bit":"32bit")+" as standalone executable\n");
121+
cmd = new String[] {ResourceUtil.getBNG2StandaloneWin(osi.is64bit()), bngInputFile.getAbsolutePath()};
122122

123123
}else{// Execute as perl script
124124
System.out.println("BNGExecutorService.executeBNG() as perl script\n");

0 commit comments

Comments
 (0)