Skip to content

Commit

Permalink
use traditional gradle project structure
Browse files Browse the repository at this point in the history
  • Loading branch information
andrescv committed Mar 2, 2019
1 parent eec06f0 commit c72e381
Show file tree
Hide file tree
Showing 286 changed files with 7,587 additions and 8,219 deletions.
16 changes: 0 additions & 16 deletions LICENSE_HEADER

This file was deleted.

1,905 changes: 0 additions & 1,905 deletions V-Sim/src/vsim/assembler/Lexer.java

This file was deleted.

5,014 changes: 0 additions & 5,014 deletions V-Sim/src/vsim/assembler/Parser.java

This file was deleted.

841 changes: 0 additions & 841 deletions V-Sim/src/vsim/gui/utils/Lexer.java

This file was deleted.

92 changes: 0 additions & 92 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import java.nio.file.Paths
// project plugins
plugins {
id 'java'
id 'com.diffplug.gradle.spotless' version '3.16.0'
}

// dependencies repositories
Expand All @@ -19,32 +18,11 @@ dependencies {
implementation name: 'java-cup-11b'
implementation 'com.jfoenix:jfoenix:8.0.8'
implementation 'org.fxmisc.richtext:richtextfx:0.9.2'
testCompile 'junit:junit:4.12'
testCompile 'org.junit.jupiter:junit-jupiter-api:5.3.2'
testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.2'
testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.3.2'
}

// redefine source files
sourceSets {
main {
java {
srcDirs = [Paths.get('V-Sim', 'src')]
}
resources {
srcDirs = [Paths.get('V-Sim', 'resources')]
}
}
test {
java {
srcDirs = [Paths.get("V-Sim", "test")]
}
resources {
srcDirs = [Paths.get("V-Sim", "test", "resources")]
}
}
}

// Java target version
sourceCompatibility = 1.8

Expand Down Expand Up @@ -76,73 +54,6 @@ test {
}
}

// Java code style formatter
spotless {
java {
licenseHeaderFile 'LICENSE_HEADER'
importOrder 'java', 'javax', 'com', 'org', 'vsim', ''
eclipse().configFile 'format.xml'
removeUnusedImports()
trimTrailingWhitespace()
}
}

// delete previous lexer class
task deleteLexer(type: Delete) {
delete Paths.get("V-Sim", "src", "vsim", "assembler", "Lexer.java")
}

// create main lexer class
task lexer(type: Exec) {
dependsOn 'deleteLexer'
commandLine([
'java', '-jar', Paths.get("lib", "jflex-1.7.0.jar"),
Paths.get("V-Sim", "src", "syntax", "lexer.flex"), "-d", Paths.get("V-Sim", "src", "vsim", "assembler")
])
}

// delete previous GUI lexer class
task deleteGUILexer(type: Delete) {
delete Paths.get("V-Sim", "src", "vsim", "gui", "utils", "Lexer.java")
}

// create GUI lexer class
task GUILexer(type: Exec) {
dependsOn 'deleteGUILexer'
commandLine([
'java', '-jar', Paths.get("lib", "jflex-1.7.0.jar"),
Paths.get("V-Sim", "src", "syntax", "guilexer.flex"), "-d", Paths.get("V-Sim", "src", "vsim", "gui", "utils")
])
}

// delete main parser class
task deleteParser(type: Delete) {
delete Paths.get("V-Sim", "src", "vsim", "assembler", "Parser.java")
}

// delete main parser symbols class
task deleteToken(type: Delete) {
delete Paths.get("V-Sim", "src", "vsim", "assembler", "Token.java")
}

// create main parser and symbols class
task parser(type: Exec) {
dependsOn 'deleteParser'
dependsOn 'deleteToken'
commandLine([
'java', '-jar', Paths.get("lib", "java-cup-11b.jar"),
"-parser", "Parser", "-symbols", "Token", "-destdir",
Paths.get("V-Sim", "src", "vsim", "assembler"), Paths.get("V-Sim", "src", "syntax", "parser.cup")
])
}

// creates lexers and parser
task syntax() {
dependsOn 'lexer'
dependsOn 'GUILexer'
dependsOn 'parser'
}

// create a task for running riscv-tests
task riscv_tests(type: Exec) {
workingDir '.'
Expand All @@ -155,8 +66,5 @@ riscv_tests.dependsOn(jar)
// run riscv_tests task after test task
test.finalizedBy(riscv_tests)

// apply spotless after syntax task
syntax.finalizedBy('spotlessApply')

// compile java source code in UTF-8
compileJava.options.encoding = 'UTF-8'
322 changes: 0 additions & 322 deletions format.xml

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit c72e381

Please sign in to comment.