Apple-2-SW/lawless-legends
1
0
Fork 0
mirror of https://github.com/badvision/lawless-legends.git synced 2024-11-18 23:07:53 +00:00
Code Issues Projects Releases Wiki Activity

A few changes to support unibuild on Windows.

Browse Source
This commit is contained in:
Martin Haye 2016-02-16 09:33:16 -08:00
parent 7d6393d9c8
commit c845bf6587
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Platform/Apple/tools/PackPartitions/src/org/demo/PackPartitions.groovy
View File

@ -1344,11 +1344,10 @@ class PackPartitions
} }
// See if it's in the resources of the jar file // See if it's in the resources of the jar file
def res = getClass().getResource("/virtual/" + partial) def res = getClass().getResource("/virtual/" + partial.replace("\\", "/"))
if (!res) if (!res)
res = getClass().getResource("/" + partial) res = getClass().getResource("/" + partial.replace("\\", "/"))
if (res) { if (res) {
//println "Found resource: $res"
def m = res.toString() =~ /^jar:file:(.*)!.*$/ def m = res.toString() =~ /^jar:file:(.*)!.*$/
assert m assert m
srcFile = new File(java.net.URLDecoder.decode(m.group(1), "UTF-8")) srcFile = new File(java.net.URLDecoder.decode(m.group(1), "UTF-8"))
@ -1617,6 +1616,7 @@ class PackPartitions
ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(newCacheFile)); ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(newCacheFile));
out.writeObject(cache); out.writeObject(cache);
out.close() out.close()
cacheFile.delete() // needed on Windows
newCacheFile.renameTo(cacheFile) newCacheFile.renameTo(cacheFile)
} }
@ -1767,6 +1767,7 @@ class PackPartitions
} }
else { else {
//println "Changed text, renaming $newFile to $oldFile" //println "Changed text, renaming $newFile to $oldFile"
oldFile.delete() // needed on Windows
newFile.renameTo(oldFile) newFile.renameTo(oldFile)
} }
} }
@ -1775,6 +1776,12 @@ class PackPartitions
{ {
// Open the XML data file produced by Outlaw Editor // Open the XML data file produced by Outlaw Editor
def dataIn = new XmlParser().parse(xmlPath) def dataIn = new XmlParser().parse(xmlPath)
// When generating code, we need to use Unix linebreaks since that's what
// the PLASMA compiler expects to see.
def oldSep = System.getProperty("line.separator")
assert oldSep != "\n"
System.setProperty("line.separator", "\n")
// Translate image names to constants // Translate image names to constants
new File("build/src/plasma").mkdirs() new File("build/src/plasma").mkdirs()
@ -1849,6 +1856,9 @@ class PackPartitions
} }
} }
replaceIfDiff("build/src/plasma/gen_modules.plh") replaceIfDiff("build/src/plasma/gen_modules.plh")
// Put back the default line separator
System.setProperty("line.separator", oldSep)
} }
def copyIfNewer(fromFile, toFile) def copyIfNewer(fromFile, toFile)