File tree Expand file tree Collapse file tree 3 files changed +8
-5
lines changed
bionetgen/win32Standalone
vcell-core/src/main/java/cbit/vcell Expand file tree Collapse file tree 3 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -426,8 +426,11 @@ public static String getBNG2_perl_file(){
426
426
return bng2_path ;
427
427
}
428
428
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 ();
431
434
}
432
435
433
436
public static File getVCellInstall ()
Original file line number Diff line number Diff line change @@ -116,9 +116,9 @@ public BNGOutput executeBNG() throws BNGException {
116
116
117
117
String [] cmd = null ;
118
118
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 ()};
122
122
123
123
}else {// Execute as perl script
124
124
System .out .println ("BNGExecutorService.executeBNG() as perl script\n " );
You can’t perform that action at this time.
0 commit comments