diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-03-22 19:26:32 +0100 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-22 19:26:32 +0100 |
| commit | efffc8687a0fe92b993e9b65de3e4511df36815d (patch) | |
| tree | d5f4d0bcf63f945641d94d87546abb9f04bfc3fb | |
| parent | f0050f45b67b0ca6539e03b23848e977f47c0905 (diff) | |
| download | etherpad-efffc8687a0fe92b993e9b65de3e4511df36815d.tar.gz etherpad-efffc8687a0fe92b993e9b65de3e4511df36815d.tar.xz etherpad-efffc8687a0fe92b993e9b65de3e4511df36815d.zip | |
Bugfix for ACE compiler
| -rwxr-xr-x | infrastructure/ace/bin/make | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/infrastructure/ace/bin/make b/infrastructure/ace/bin/make index dad11ff..0a39d91 100755 --- a/infrastructure/ace/bin/make +++ b/infrastructure/ace/bin/make @@ -263,15 +263,15 @@ def doMake { def copyFileToEtherpad(fromName: String, toName: String) { var code = getFile(srcDir+"/"+fromName); - code = replaceFirstLine(code, "// DO NOT EDIT THIS FILE, edit "+ - "infrastructure/ace/www/"+fromName); + code = "// DO NOT EDIT THIS FILE, edit "+ + "infrastructure/ace/www/"+fromName+"\n"+code; code = code.replaceAll("""(?<=\n)\s*//\s*%APPJET%:\s*""", ""); putFile(code, "../../etherpad/src/etherpad/collab/ace/"+toName); } def copyFileToClientSide(fromName: String, toName: String) { var code = getFile(srcDir+"/"+fromName); - code = replaceFirstLine(code, "// DO NOT EDIT THIS FILE, edit "+ - "infrastructure/ace/www/"+fromName); + code = "// DO NOT EDIT THIS FILE, edit "+ + "infrastructure/ace/www/"+fromName+"\n"+code; code = code.replaceAll("""(?<=\n)\s*//\s*%APPJET%:.*?\n""", ""); code = code.replaceAll("""(?<=\n)\s*//\s*%CLIENT FILE ENDS HERE%[\s\S]*""", ""); |