Skip to content

Commit d7866e6

Browse files
authored
Merge pull request #153 from JetBrains/feature/incremental-build
build: add support for incremental generation
2 parents 511c108 + 587279d commit d7866e6

File tree

4 files changed

+20
-212
lines changed

4 files changed

+20
-212
lines changed

build.gradle

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,23 +174,19 @@ ext.artifacts_dir = '-Dartifacts.root=' + artifactsDir
174174
ext.pluginVersion = "-DversionNumber=" + version
175175
ext.buildDate = "-DbuildDate=" + new Date().toString()
176176
ext.extensions_home = '-Dextensions.home=' + rootDir
177+
ext.skipUnmodifiedModels = "-Dmps.generator.skipUnmodifiedModels=true" //incremental build support
177178

178179
// ___________________ utilities ___________________
179180
File scriptFile(String relativePath) {
180181
new File("$rootDir/build/generated/$relativePath")
181182
}
182183

183-
def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.pluginVersion]
184+
def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.pluginVersion, ext.skipUnmodifiedModels]
184185

185186

186187

187188
task build_allScripts(type: BuildLanguages, dependsOn: [resolveMps]) {
188-
script scriptFile('allScripts/build.xml')
189-
inputs.file(scriptFile('allScripts/build.xml'))
190-
inputs.dir("$rootDir/code/mps-build/solutions/de.slisson.mps.all.build/models")
191-
inputs.file("$rootDir/code/mps-build/solutions/de.slisson.mps.all.build/de.slisson.mps.all.build.msd")
192-
outputs.dir("$rootDir/build/generated/languages")
193-
outputs.dir("$rootDir/build/generated/tests")
189+
script "$rootDir/scripts/build.xml"
194190
scriptArgs = defaultScriptArgs
195191
scriptClasspath = buildScriptClasspath
196192
}
@@ -259,6 +255,12 @@ task packageExtensions(type: Zip, dependsOn: run_tests) {
259255
include 'de.itemis.mps.extensions/**'
260256
}
261257

258+
task cleanMps(type: Delete) {
259+
delete fileTree(dir: projectDir, include: ["**/classes_gen/**", "**/source_gen/**", "**/source_gen.caches/**", "tmp/**", "artifacts/**"])
260+
}
261+
262+
clean.dependsOn cleanMps
263+
262264
publishing {
263265
repositories {
264266
maven {
@@ -296,6 +298,10 @@ publishing {
296298
defaultTasks 'build_languages'
297299
task test(dependsOn: run_tests)
298300

301+
build_languages.mustRunAfter clean
302+
303+
task rebuild(dependsOn:[clean, build_languages])
304+
299305
def releaseNotes
300306
def releaseName
301307
def releaseTagName

build/allScripts/build.xml

Lines changed: 0 additions & 192 deletions
This file was deleted.

code/build/solutions/allScripts/models/build.mps

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
</registry>
107107
<node concept="1l3spW" id="2Xjt3l56m0V">
108108
<property role="TrG5h" value="de.itemis.mps.extensions.allScripts" />
109-
<property role="2DA0ip" value="../../../../build/generated/allScripts" />
109+
<property role="2DA0ip" value="../../../../scripts" />
110110
<node concept="2G$12M" id="2Xjt3l5bx4Z" role="3989C9">
111111
<property role="TrG5h" value="de.slisson.mps.all" />
112112
<node concept="1E1JtA" id="PE3B26VOkn" role="2G$12L">
@@ -221,12 +221,6 @@
221221
<node concept="55IIr" id="1QLFoGON23t" role="398pKh">
222222
<node concept="2Ry0Ak" id="1QLFoGON23u" role="iGT6I">
223223
<property role="2Ry0Am" value=".." />
224-
<node concept="2Ry0Ak" id="2IxvlKPaLFA" role="2Ry0An">
225-
<property role="2Ry0Am" value=".." />
226-
<node concept="2Ry0Ak" id="2fo8bJEzAKn" role="2Ry0An">
227-
<property role="2Ry0Am" value=".." />
228-
</node>
229-
</node>
230224
</node>
231225
</node>
232226
</node>

0 commit comments

Comments
 (0)