[Laszlo-dev] For Review: Change 20070118-papley-F Summary: UNTANGLE - Minor changes.

[Phillip George Apley]

Change 20070118-papley-F by papley at PGAPBG417.local on 2007-01-18  
00:49:08 EST
     in /Users/papley/src/svn/legals

Summary: UNTANGLE

New Features:
     Restructures the build hierarchy so that there is no longer a  
build/src,
     making it much less confusing and making Eclipse happy.

Bugs Fixed:

Technical Reviewer: (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)

Documentation:
	Differs from the first patch in documentation and removal of some  
unnecessary exclude tags.

Release Notes:
	Run ant clean before trying to build with this the first time.

Details:
<!--
This comment summarizes the path and package property usage and the
compilation pipeline for each ant target and each major file  
transformation.

The items in curly braces show properties and/or
pathnames before and after the change that untangled the 1.3 and 1.4
sources and removed the secondary sources from the build file.

Transform; input-path ==to== output-path
{Old Package Path Property and Path ==to== New Package Path Property  
and Path}

Target [css-parser]
javacc; ./src/org/openlaszlo/css/CSSParser.jj
                 ==to==
                 ./build.1.4/src/org/openlaszlo/css/*.java
                 {build.java ==changed to== build.java.1.4}

Target [sc-parser]
jjtree; ./sc/src/org/openlaszlo/sc/Parser.jjt
                ==to==
                ./build.1.4/src/org/openlaszlo/sc/parser/Parser.jj

javacc; ./buildJJ/src/org/openlaszlo/sc/parser/Parser.jj
                 ==to==
                 (Java 1.4 jjt sources)
                 ./build.1.4/src/org/openlaszlo/sc/parser/*.java

copy;   ./sc/src/org/openlaszlo/sc/parser/*.java
                 ==to==
                 ./build.1.4/src/org/openlaszlo/sc/parser
                 {sc.build.java = build/src/org/openlaszlo/sc
                 ==changed to==
                 sc.build.java.1.4 = build.1.4/src/org/openlaszlo/sc}
Target [sc-compiler]   (1.3 sources created by jython)
jython; sc.src.py = ./sc/LFCCompiler.py
                 ==to==
                 ./build.1.3/src/ (org/openlaszlo/sc/) LFCCompiler.java

                 {sc.build.java = build/src/org/openlaszlo/sc
                 ==changed to==
                 sc.build.java.1.3 = build.1.3/src/org/openlaszlo/sc}
                 {build.java = ./build/src
                  ==changed to==
                  build.java.1.3 = ./build.1.3/src}

Target [compile]
javac (1.3);    java.1.3.srcs = build.java = ./build.1.3/src
                         ==to== build = ./build
javac (1.4);
       ${java.1.4.srcs} =
       ${buildsrc.1.4} : ${src}:${jgen.src}:${jjt.src} =
       ./build.1.4/src : ./src : ./jgenerator-2.2/src : ./build.1.4/ 
src/org/openlaszlo/sc/parser
       ==to==
       ./build
-->

Tests:
	Compiled several times from various starting points on Mac. Henry  
tested on PC.

Files:
M      WEB-INF/lps/server/build.xml

Changeset: http://svn.openlaszlo.org/openlaszlo/patches/20070118- 
papley-F.tar