Skip to content

Commit c6e7b66

Browse files
committed
update now jar is being created
1 parent 7b9ddf3 commit c6e7b66

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

src/cfml/system/util/CompileDSL.cfc

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@ component accessors=true {
314314
var jarName = getJarNameString();
315315
var currentProjectRoot = getProjectRoot();
316316

317-
/* var tempSrcFileName = tempDir & 'temp#createUUID()#.txt'; */
318-
var tempSrcFileName = currentProjectRoot & 'temp#createUUID()#.txt';
317+
var tempClassFileName = tempDir & 'temp#createUUID()#.txt';
318+
/* var tempClassFileName = currentProjectRoot & 'temp#createUUID()#.txt'; */
319319

320320
var sourceFolders = [];
321321
buildJarSourceFolders = fileSystemutil.resolvePath( variables.classOutputDirectory, getProjectRoot() );
@@ -355,8 +355,7 @@ component accessors=true {
355355

356356
try{
357357
//writeTempSourceFile( tempSrcFileName,['D:\Javatest\greetings\classes\**.class'], ".class" );
358-
//writeTempSourceFile( tempSrcFileName, sourceFolders, ".class" );
359-
writeTempClassFiles( "D:\Javatest\test-new-01\ClassFile123456.txt",sourceFolders, ".class" );
358+
writeTempClassFiles( tempClassFileName, sourceFolders, ".class" );
360359

361360
var jarClassString = createClassStringFromClassTextFiles()
362361

@@ -367,18 +366,18 @@ component accessors=true {
367366
//j = 'run "#getJavaBinFolder()#jar" --file #currentLibsDir##jarName# #getJarOptionsString()#';
368367
//j = 'run "#getJavaBinFolder()#jar" --create --file #currentLibsDir#testX.jar "@#tempSrcFileName#" #getJarOptionsString()#';
369368
if( !getCustomManifest().len() ) {
370-
j = 'run ""#getJavaBinFolder()#jar" cf "#currentLibsDir##jarName#" "@#tempSrcFileName#" #getJarOptionsString()#"';
369+
j = 'run ""#getJavaBinFolder()#jar" cf "#currentLibsDir##jarName#" "@#tempClassFileName#" #getJarOptionsString()#"';
371370
} else {
372-
j = 'run ""#getJavaBinFolder()#jar" cfm "#currentLibsDir##jarName#" "#variables.customManifest#" "@#tempSrcFileName#" #getJarOptionsString()#"';
371+
j = 'run ""#getJavaBinFolder()#jar" cfm "#currentLibsDir##jarName#" "#variables.customManifest#" "@#tempClassFileName#" #getJarOptionsString()#"';
373372
}
374373
job.addLog( j );
375374
//command( j ).run(echo=true);
376-
//command( j ).run();
375+
command( j ).run();
377376

378377
} finally {
379-
/* if ( FileExists( tempSrcFileName ) ) {
380-
fileDelete( tempSrcFileName );
381-
} */
378+
if ( FileExists( tempClassFileName ) ) {
379+
fileDelete( tempClassFileName );
380+
}
382381
}
383382

384383

0 commit comments

Comments
 (0)