Hm, looks like there is some vestigial 1.3 stuff still around. I'll
send you an update.
Bleah. I don't like that in the new regime these build dirs hang
around after a clean. Apparently this is because eclipse wants to
store some information in them? Grumble.
On 2007-01-24, at 03:43 EST, Jim Grandy wrote:
OK, I integrated your changes ok. Now I'm seeing a build error.
Command is 'ant clean build'. I don't see this build error with a
clean tree.
First clue:
clean:
[delete] Deleting directory /Users/jgrandyw/dev/svn/openlaszlo/
branches/legals2/WEB-INF/lps/schema/build
[delete] Deleting: /Users/jgrandyw/dev/svn/openlaszlo/branches/
legals2/WEB-INF/lps/schema/lzxdoc.rng
[delete] Deleting: /Users/jgrandyw/dev/svn/openlaszlo/branches/
legals2/WEB-INF/lps/schema/lzx.rng
[delete] Deleting: /Users/jgrandyw/dev/svn/openlaszlo/branches/
legals2/WEB-INF/lps/schema/lzx.xsd
clean:
[delete] Deleting 1 files from /Users/jgrandyw/dev/svn/
openlaszlo/branches/legals2/WEB-INF/lps/server/build
[delete] /Users/jgrandyw/dev/svn/openlaszlo/branches/legals2/
WEB-INF/lps/server/build.1.3 not found.
[delete] Deleting 76 files from /Users/jgrandyw/dev/svn/
openlaszlo/branches/legals2/WEB-INF/lps/server/build.1.4
[delete] /Users/jgrandyw/dev/svn/openlaszlo/branches/legals2/
WEB-INF/lps/server/${classes1.3} not found.
Then:
[javacc] File "Token.java" does not exist. Will create one.
[javacc] File "SimpleCharStream.java" does not exist. Will
create one.
[javacc] Parser generated successfully.
[copy] Copying 5 files to /Users/jgrandyw/dev/svn/openlaszlo/
branches/legals2/WEB-INF/lps/server/build.1.4/src/org/openlaszlo/
sc/parser
compile:
BUILD FAILED
/Users/jgrandyw/dev/svn/openlaszlo/branches/legals2/build.xml:489:
The following error occurred while executing this line:
/Users/jgrandyw/dev/svn/openlaszlo/branches/legals2/WEB-INF/lps/
server/build.xml:407: srcdir "/Users/jgrandyw/dev/svn/openlaszlo/
branches/legals2/WEB-INF/lps/server/build.1.3/src" does not exist!
On Jan 23, 2007, at 11:28 PM, Jim Grandy wrote:
I can just do the same. Thanks!
I think we should consider moving (post-OL4) to a review system
where we submit changes for review by checking into a private
branch, and integrate changes by merging from the private branch.
It's much more fool-proof than what we have now.
jim
On Jan 23, 2007, at 7:08 PM, P T Withington wrote:
Er, I 'svn mv'-ed server/sc/lzsc.py to server/src/org/openlaszlo/
sc/lzsc.java and then modified it. I guess our diff mechanism
doesn't work that well in that case. You could try just
unpacking the files.tar file instead?
On 2007-01-23, at 17:29 EST, Jim Grandy wrote:
Is this cumulative to another patch? It wants to modify WEB-INF/
lps/server/src/org/openlaszlo/sc/lzsc.java, which doesn't exist
in branches/legals.
jgrandy-pb:~/dev/svn/openlaszlo/branches/legals2 jgrandyw$
20070122-ptw-1/apply.sh
patching file WEB-INF/lps/server/sc/LFCCompiler.py
patching file WEB-INF/lps/server/sc/lzsc.py
patching file WEB-INF/lps/server/src/org/openlaszlo/sc/
Instructions.java
can't find file to patch at input line 311
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: WEB-INF/lps/server/src/org/openlaszlo/sc/lzsc.java
|
===================================================================
|--- WEB-INF/lps/server/src/org/openlaszlo/sc/lzsc.java
(revision 3473)
|+++ WEB-INF/lps/server/src/org/openlaszlo/sc/lzsc.java (working
copy)
--------------------------
File to patch:
On Jan 23, 2007, at 1:40 PM, P T Withington wrote:
Updated: Responding to Ben's review comments.
Change 20070122-ptw-1 by [EMAIL PROTECTED] on 2007-01-22
17:22:13 EST
in /Users/ptw/OpenLaszlo/legals-1
Summary: Finish Ben's good work
Bugs Fixed:
LPP-NaN: Get rid of more Python
Technical Reviewer: ben (pending)
QA Reviewer: jgrandy (pending)
Doc Reviewer: n/a (pending)
Details:
LFCCompiler.py, lzsc.py: obsolete
Instructions: permit Boolean as arg to push
lzsc.java: Slavish conversion from lzsc.py
JavascriptGenerator, CodeGenerator: remove old Python
heuristicating
Main: call lzsc directly
build.xml: No more sc-compiler target
Tests:
ant clean make, diffed the LFCdhtml, no significant
difference,
smoke/smokecheck runs.
Files:
D WEB-INF/lps/server/sc/LFCCompiler.py
D WEB-INF/lps/server/sc/lzsc.py
M WEB-INF/lps/server/src/org/openlaszlo/sc/Instructions.java
A + WEB-INF/lps/server/src/org/openlaszlo/sc/lzsc.java
M WEB-INF/lps/server/src/org/openlaszlo/sc/
JavascriptGenerator.java
M WEB-INF/lps/server/src/org/openlaszlo/sc/CodeGenerator.java
M WEB-INF/lps/server/src/org/openlaszlo/sc/Main.java
M WEB-INF/lps/server/build.xml
Changeset: http://svn.openlaszlo.org/openlaszlo/patches/
20070122-ptw-1.tar
