Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
b78bf62
creating CompileDSL file
BalbinoOrtus Aug 23, 2021
0be9d54
fixing compileDSL and adding compile to basecommand
BalbinoOrtus Sep 1, 2021
36d7a56
worked on projectRoot, fromSource methods
BalbinoOrtus Sep 2, 2021
4c5a44d
added methods withVerbose(), withEncoding(), toClasses() and testing
BalbinoOrtus Sep 3, 2021
0c95435
add support for list or array of source folders
BalbinoOrtus Sep 8, 2021
ffd1fb0
refactoring
BalbinoOrtus Sep 10, 2021
6fb7bf2
refactoring and working on toJar() buildJar()
BalbinoOrtus Sep 29, 2021
b1f2a18
basic manifest method
BalbinoOrtus Oct 11, 2021
300de08
fix for commandstring, added with resources
BalbinoOrtus Oct 26, 2021
2943833
added code to move resources to jar
BalbinoOrtus Oct 27, 2021
b0e4726
added comment steps for update Manifest file
BalbinoOrtus Oct 27, 2021
44e4ea6
fix bug on method withResources
BalbinoOrtus Oct 27, 2021
cf53974
update added updateManifestFile() method, checks for box.json
BalbinoOrtus Nov 3, 2021
de996ff
fixed the update manifest, now created jar has modifications
BalbinoOrtus Nov 9, 2021
d4228b6
fixed source default, fixed use of manifest library
BalbinoOrtus Dec 21, 2021
d484ed9
update on compile dsl, preparing a new strategy for jar
BalbinoOrtus Jan 13, 2022
057d9d7
update on create class file to create jar wip
BalbinoOrtus Jan 25, 2022
2c978d5
update each line generated
BalbinoOrtus Jan 26, 2022
b6db970
update now jar is being created
BalbinoOrtus Jan 28, 2022
7bceb0d
wip javadocs
BalbinoOrtus Mar 9, 2022
7670a6d
rethink fat jar with compile dsl
BalbinoOrtus Apr 26, 2022
b706fe4
creating CompileDSL file
BalbinoOrtus Aug 23, 2021
909f8db
fixing compileDSL and adding compile to basecommand
BalbinoOrtus Sep 1, 2021
a34e98d
worked on projectRoot, fromSource methods
BalbinoOrtus Sep 2, 2021
bda98f8
added methods withVerbose(), withEncoding(), toClasses() and testing
BalbinoOrtus Sep 3, 2021
5b38dcb
add support for list or array of source folders
BalbinoOrtus Sep 8, 2021
385f4b5
refactoring
BalbinoOrtus Sep 10, 2021
3cd129b
refactoring and working on toJar() buildJar()
BalbinoOrtus Sep 29, 2021
cbe5fc9
basic manifest method
BalbinoOrtus Oct 11, 2021
5df3dce
fix for commandstring, added with resources
BalbinoOrtus Oct 26, 2021
3a77a71
added code to move resources to jar
BalbinoOrtus Oct 27, 2021
5e570c5
added comment steps for update Manifest file
BalbinoOrtus Oct 27, 2021
f53f980
fix bug on method withResources
BalbinoOrtus Oct 27, 2021
e831c53
update added updateManifestFile() method, checks for box.json
BalbinoOrtus Nov 3, 2021
2d0024d
fixed the update manifest, now created jar has modifications
BalbinoOrtus Nov 9, 2021
5b7efc5
fixed source default, fixed use of manifest library
BalbinoOrtus Dec 21, 2021
f46f728
update on compile dsl, preparing a new strategy for jar
BalbinoOrtus Jan 13, 2022
64db8a3
update on create class file to create jar wip
BalbinoOrtus Jan 25, 2022
caa5126
update each line generated
BalbinoOrtus Jan 26, 2022
002bfb7
update now jar is being created
BalbinoOrtus Jan 28, 2022
fe83fe0
wip javadocs
BalbinoOrtus Mar 9, 2022
cca5e9b
rethink fat jar with compile dsl
BalbinoOrtus Apr 26, 2022
37dc57e
Merge branch 'dev/commandbox-748' of https://github.com/Ortus-Solutio…
BalbinoOrtus May 24, 2022
0bbcbc0
Merge branch 'development' into dev/commandbox-748
BalbinoOrtus Jul 7, 2022
56ac0ec
added code for javadoc java command
BalbinoOrtus Jul 20, 2022
64629f0
fixed run command, added catch code 4 errors
BalbinoOrtus Jul 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/cfml/system/BaseCommand.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -348,5 +348,9 @@ component accessors="true" singleton {
return getCurrentThread().getName();
}

function compile() {
return getinstance( "compileDSL" )
.projectRoot( resolvePath( '' ) );
}

}
1 change: 1 addition & 0 deletions src/cfml/system/Shell.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,7 @@ component accessors="true" singleton {
var result = variables.commandService.runCommandTokens( tokens=arguments.command, captureOutput=returnOutput, line=line );
}
} else {
//systemoutput("callCommand p3->");
var result = variables.commandService.runCommandLine( arguments.command, returnOutput );
}

Expand Down
14 changes: 11 additions & 3 deletions src/cfml/system/util/CommandDSL.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ component accessors=true {
if( isStruct( paramStruct[ param ] ?: '' ) ) {
paramStruct[ param ].each( (k,v)=>processedParams.append( '#param#:#k#="#parser.escapeArg( v ?: '' )#"' ) );
} else {
processedParams.append( '#param#="#parser.escapeArg( paramStruct[ param ] ?: '' )#"' );
processedParams.append( '#param#="#parser.escapeArg( paramStruct[ param ] ?: '' )#"' );
}
}
}
Expand Down Expand Up @@ -223,8 +223,13 @@ component accessors=true {
**/
string function getCommandString() {
var tokens = getCommand();
tokens &= ' ' & processParams().toList( ' ' );
tokens &= ' '& getFlags().toList( ' ' );
if( getParams().len() ) {
tokens &= ' ' & processParams().toList( ' ' );
}

if( getFlags().len() ) {
tokens &= ' '& getFlags().toList( ' ' );
}

if( len( getOverwrite() ) ) {
tokens &= ' > ' & getOverwrite();
Expand All @@ -246,6 +251,9 @@ component accessors=true {
**/
string function run( returnOutput, string piped, boolean echo, boolean rawParams ) {

/* systemoutput( "test 01->" )
systemoutput( "::#getCommand()#::" );
systemoutput( "::#getCommandString()#::" ); */
if( !isNull( arguments.rawParams ) ) { setRawParams( arguments.rawParams ); }
if( !isNull( arguments.piped ) ) { setPipedInput( arguments.piped ); }
if( !isNull( arguments.echo ) ) { setEcho( arguments.echo ); }
Expand Down
Loading