diff options
| author | jhugunin <jhugunin> | 2003-03-28 00:54:19 +0000 |
|---|---|---|
| committer | jhugunin <jhugunin> | 2003-03-28 00:54:19 +0000 |
| commit | e3ad8bbd021d8949bc2c45a2e1749cb1d720a195 (patch) | |
| tree | 031826b431705d94d1207e3174e7b8ee17c5e58b /org.aspectj.ajdt.core/scripts | |
| parent | 8e31e9be0fe8c04fd6c1802a9262b9e1c00187dc (diff) | |
| download | aspectj-e3ad8bbd021d8949bc2c45a2e1749cb1d720a195.tar.gz aspectj-e3ad8bbd021d8949bc2c45a2e1749cb1d720a195.zip | |
Major changes in order to move to Eclipse-JDT 2.1 as a base.
In the process of this many changes were made to try to make
keeping up with the Eclipse-JDT code base as easy as possible in
the future.
Diffstat (limited to 'org.aspectj.ajdt.core/scripts')
| -rw-r--r-- | org.aspectj.ajdt.core/scripts/makeparser.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/org.aspectj.ajdt.core/scripts/makeparser.py b/org.aspectj.ajdt.core/scripts/makeparser.py index 56ed3cf89..a67aff10a 100644 --- a/org.aspectj.ajdt.core/scripts/makeparser.py +++ b/org.aspectj.ajdt.core/scripts/makeparser.py @@ -1,9 +1,9 @@ # set these first four variables appropriately for your system -eclipseWorkspace = "c:/eclipse/workspace" +eclipseWorkspace = "c:/aspectj/2.1/eclipse/workspace" workingDir = "c:/apps/jikespg/jdt/tmp" -jikespg = "c:/apps/jikespg/src/a.exe" -makersc = "c:/jdk1.4/bin/java -classpath c:/eclipse/workspace/org.eclipse.jdt.core/bin;c:/apps/jikespg/jdt;c:/eclipse/workspace/weaver/bin UpdateParserFiles" +jikespg = "c:/apps/jikespg/src/jikespg.exe" +makersc = "c:/j2sdk1.4/bin/java -classpath c:/aspectj/2.1/eclipse/workspace/org.eclipse.jdt.core/bin;c:/apps/jikespg/jdt UpdateParserFiles" # the rest of this should never change ajCompilerHomeRel = "org.aspectj.ajdt.core/src/" @@ -12,11 +12,10 @@ javaCompilerHomeRel = "org.eclipse.jdt.core/compiler/" compilerHomeRel = ajCompilerHomeRel parserHomeRel = ajCompilerHomeRel + "org/aspectj/ajdt/internal/compiler/parser" parserInfoFileRel = javaCompilerHomeRel + "org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java" -symbolsHomeRel = javaCompilerHomeRel + "org/eclipse/jdt/core/compiler/ITerminalSymbols.java" +symbolsHomeRel = javaCompilerHomeRel + "org/eclipse/jdt/internal/compiler/parser/TerminalTokens.java" # symbolsHomeRel = "org/aspectj/ajdt/compiler/IAjTerminalSymbols.java" parserClass = "AjParser.java" -grammarFileRel = javaCompilerHomeRel + "org/eclipse/jdt/internal/compiler/parser/aj_grammar.txt" - +grammarFileRel = javaCompilerHomeRel + "../grammar/java_1_4.g" import os from os import path @@ -102,7 +101,7 @@ writeFile(parserInfoFile, text) #3.4 This is the contents of the class org.eclipse.jdt.internal.compiler.parser.TerminalSymbols. defs = readFile(path.join(workingDir, "javasym.java")) -r = re.compile(r"(public final static int[^;]*;)", re.DOTALL) +r = re.compile(r"(int[^;]*;)", re.DOTALL) syms = r.search(defs).group(0) syms = syms.replace("$eof", "EOF") syms = syms.replace("$error", "ERROR") |