[Sheets-cvs] sheets build.bat,NONE,1.1 centibuild.xml,NONE,1.1 module.xml,NONE,1.1 properties.xml,NONE,1.1 status.xml,NONE,1.1 Sheets.sheets,1.20,1.21 build.xml,1.10,1.11 todo.txt,1.1,1.2 LICENSE.txt,1.1,NONE

[<ox-...@us...>]

Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv5930

Modified Files:
	Sheets.sheets build.xml todo.txt 
Added Files:
	build.bat centibuild.xml module.xml properties.xml status.xml 
Removed Files:
	LICENSE.txt 
Log Message:
Sheets Change: Fixed documentation export so it is relative to the project root.

Build Changes: Laid the groundwork for moving to centipede for code, documentation, and site building.  There is still a lot more work to be done, but the basic build system is in place.  For the time being, the ant targets still work as usual, so there is no need to change the way you do builds.


--- NEW FILE: build.bat ---
@echo off
set CENTIPEDE_OPTS="-mx128m"
cent -emacs %*

--- NEW FILE: centibuild.xml ---
<?xml version="1.0"?>
	
<project default="all" basedir="." name="Sheets">

	    <description>
	                       * ===================================== *
	                       |   Krysalis Centipede Build System     |
	                       * ===================================== *
	                                         by
	
	                       Nicola Ken Barozzi (nic...@ap...)
	                       Marc Johnson (mjo...@ap...)
	    </description>


    <import file="${ant.home}/src/core/xbuild.xml"/>
    
    <taskdef file="${ant.home}/src/core/tasks.properties"/>
    
    <importcent name="java"/>
    
    <importcent name="antidote"/> 
    <importcent name="checkstyle"/> 
    <importcent name="forrest"/> 

                
    <!-- =================================================================== -->
    <!-- Basic build targets for the project                                 -->
    <!-- =================================================================== -->

	<target name="all" depends="package, javadocs, forrest.docs" 
			description="Creates the jars and the site."/>
</project>

--- NEW FILE: module.xml ---
<?xml version="1.0"?>

<module name="sheets">

    <cvs repository="sourceforge"
        host-prefix="cvs.sheets"
        dir="."
        module="sheets"
        href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/sheets/"/>

    <!-- need to change this -->
    <jars repository="maven" 
          href="http://www.ibiblio.org/maven/"/>
      
    <description>
       The Sheets Hypertext Environment for Editing Text and Structure
    </description>

    <detailed>
       Sheets is an integrated coding and documentation system that features advanced navigational aids.
    </detailed>

    <what>
        <goal>Provide a user-friendly programming and documentation environment for object oriented languages.</goal>
        <goal>Facilitate the interaction of large, widely-dispersed teams on large-scale programming projects.</goal>
    </what>

    <why>
      It is about time someone created a cool IDE that was not spawned off of a failed commercial endeavor.
    </why>

    <vendor>Sheets Project - http://www.browsecode.org/</vendor>

    <licence legal="./legal">
             This software is released under the Open Source License v1.1.
             For detailed legal and licensing issues, please read the LICENSE.* files
             in the /legal directory.
    </licence>

    <credits>
        <credit>
          This software is developed by a group of volunteer developers.  See the project page at
          http://sourceforge.net/projects/sheets for the full list of contributors.
        </credit>
    </credits>

    <project name="sheets">

        <version major="0"
            minor="0"
            fix  ="1"
            tag="alpha1-dev"/>

        <package>org.browsecode.sheets</package>

        <ant target="gump" vm="1.2"/>

        <!-- Work dirs to be included in classpath  -->
        <work nested="build/classes"/>
        <home nested="build"/>

        <depend project="ox" version="supplied"/>
        <depend project="antlrall" version="supplied"/>
        <depend project="bcel" version="supplied"/>
        <depend project="bootstrap-sheets" version="supplied"/>
        <depend project="jlfgr-1_0" version="supplied"/>
        <depend project="kunststoff" version="supplied"/>

        <code type="java/plain" dir="src/java"/>
        <documentation type="xml/forrest" dir="src/documentation"/>          
    </project>

</module>





--- NEW FILE: properties.xml ---
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="tools/antipede/resources/stylesheets/properties.xsl"?>
<!-- Build properties - these override any property specified in the build -->
<properties>
   <forrest>
      <cent>
         <project skin="sheets-site"/>
      </cent>
   </forrest>
   <centipede>
      <tools>
         <cents >
            <forrest>
              <loglevel>WARN</loglevel>
               <skin name="sheets-site">
                  <navlinks>
                     <link1
                      href="http://sourceforge.net/projects/sheets">sourceforge</link1>

                     <link2
                      href="http://www.versionablestore.com/">ox</link2>
                  </navlinks>

                  <logo>
                     <project
                      src="graphics/stump.gif"
                      href="http://www.browsecode.org/" />
                  </logo>
               </skin>
            </forrest>
         </cents>
      </tools>
   </centipede>
</properties>


--- NEW FILE: status.xml ---
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="tools/antipede/resources/stylesheets/status.xsl"?>
<status>

  <developers>
    <!-- in strict id alphabetical order -->
    <person name="Stephen Chin"       id="ox-eater"  email="ox-...@us..."/>
  </developers>
  
  <todo>
   <actions priority="high">
    <action context="docs" assigned-to="ox-eater">
      Test, test, test :-)
    </action>   
   </actions>   
  </todo>


</status>


Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Sheets.sheets	27 Nov 2002 04:50:47 -0000	1.20
--- Sheets.sheets	28 Nov 2002 06:54:52 -0000	1.21
***************
*** 33502,33506 ****
       needsExporting = false;
       stateChanged();
!      ExportedFile file = new ExportedFile(this, new File(getFilename()));
       this.export(file, 0);
       ExportRecord lastExport = file.close();
--- 33502,33510 ----
       needsExporting = false;
       stateChanged();
!      System.out.println("project = " + project);
!      System.out.println("project = " + getProject());
!      System.out.println("rootFrag = " + getProject().getRootFrag());
!      System.out.println("root = " + getProject().getRootFrag().getRoot());
!      ExportedFile file = new ExportedFile(this, new File(new File(getProject().getRootFrag().getRoot()), getFilename()));
       this.export(file, 0);
       ExportRecord lastExport = file.close();
***************
*** 103375,103379 ****
   filename=>menu
   project=Sheets
!  root=src
   title=Project Sheets
   type=project
--- 103379,103383 ----
   filename=>menu
   project=Sheets
!  root=src/java
   title=Project Sheets
   type=project
***************
*** 103474,103478 ****
   ram:2490
  object ram:2493
!  filename=docs/reference.xml
   title=Reference Manual
   type=doc-section
--- 103478,103482 ----
   ram:2490
  object ram:2493
!  filename=../documentation/content/xdocs/reference.xml
   title=Reference Manual
   type=doc-section
***************
*** 104629,104633 ****
   ram:2881
  object ram:2895
!  filename=docs/repository.xml
   title=Versioning and the Repository
   type=doc-section
--- 104633,104637 ----
   ram:2881
  object ram:2895
!  filename=../documentation/content/xdocs/repository.xml
   title=Versioning and the Repository
   type=doc-section
***************
*** 106715,106719 ****
   rgs:13568
  object rgs:13583
!  filename=docs/architecture.xml
   title=Architectural Overview
   type=doc-section
--- 106719,106723 ----
   rgs:13568
  object rgs:13583
!  filename=../documentation/content/xdocs/architecture.xml
   title=Architectural Overview
   type=doc-section

Index: build.xml
===================================================================
RCS file: /cvsroot/sheets/sheets/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** build.xml	31 Oct 2002 20:15:23 -0000	1.10
--- build.xml	28 Nov 2002 06:54:57 -0000	1.11
***************
*** 3,10 ****
    <!-- set global properties for this build -->
    <property name="JAVACC_HOME"   value="tools"/>
!   <property name="src"           value="src"/>
!   <property name="jars"          value="jars"/>
    <property name="graphics"      value="graphics"/>
    <property name="build"         value="build"/>
    <property name="test"          value="test"/>
    <property name="dist"          value="dist"/>
--- 3,11 ----
    <!-- set global properties for this build -->
    <property name="JAVACC_HOME"   value="tools"/>
!   <property name="java"          value="src/java"/>
!   <property name="lib"          value="lib"/>
    <property name="graphics"      value="graphics"/>
    <property name="build"         value="build"/>
+   <property name="classes"       value="${build}/sheets/classes"/>
    <property name="test"          value="test"/>
    <property name="dist"          value="dist"/>
***************
*** 19,23 ****
      <tstamp/>
      <!-- Create the build directory structure used by compile -->
!     <mkdir dir="${build}"/>
    </target>
  
--- 20,24 ----
      <tstamp/>
      <!-- Create the build directory structure used by compile -->
!     <mkdir dir="${classes}"/>
    </target>
  
***************
*** 25,34 ****
            description="Compiles the java code (automatically exports from Sheets)">
      <!-- Invoke sheets and export the code if necessary -->
!     <available file="${src}" type="dir" property="export.exists"/>
      <antcall target="exportcode"/>
  
      <!-- Run the parser generator on the code -->
!     <property name="javadir" value="${src}/org/browsecode/javaStuff"/>
!     <property name="htmldir" value="${src}/org/browsecode/html"/>
      <jjtree target="${parsers}/JavaParser.jjt" outputdirectory="${javadir}" javacchome="${JAVACC_HOME}"/>
      <jjtree target="${parsers}/HtmlParser.jjt" outputdirectory="${htmldir}" javacchome="${JAVACC_HOME}"/>
--- 26,35 ----
            description="Compiles the java code (automatically exports from Sheets)">
      <!-- Invoke sheets and export the code if necessary -->
!     <available file="${java}" type="dir" property="export.exists"/>
      <antcall target="exportcode"/>
  
      <!-- Run the parser generator on the code -->
!     <property name="javadir" value="${java}/org/browsecode/javaStuff"/>
!     <property name="htmldir" value="${java}/org/browsecode/html"/>
      <jjtree target="${parsers}/JavaParser.jjt" outputdirectory="${javadir}" javacchome="${JAVACC_HOME}"/>
      <jjtree target="${parsers}/HtmlParser.jjt" outputdirectory="${htmldir}" javacchome="${JAVACC_HOME}"/>
***************
*** 36,40 ****
      <javacc target="${javadir}/JavaParser.jj" javacchome="${JAVACC_HOME}"/>
  
!     <property name="xquerydir" value="${src}/org/browsecode/xquery"/>
      <mkdir dir="${xquerydir}"/>
      <antlr target="${parsers}/XQuery/BaseLexer.g" outputdirectory="${xquerydir}"/>
--- 37,41 ----
      <javacc target="${javadir}/JavaParser.jj" javacchome="${JAVACC_HOME}"/>
  
!     <property name="xquerydir" value="${java}/org/browsecode/xquery"/>
      <mkdir dir="${xquerydir}"/>
      <antlr target="${parsers}/XQuery/BaseLexer.g" outputdirectory="${xquerydir}"/>
***************
*** 43,47 ****
      <antlr target="${parsers}/XQuery/XQueryParser.g" outputdirectory="${xquerydir}"/>
  
!     <property name="antlrdir" value="${src}/antlr"/>
      <mkdir dir="${antlrdir}"/>
      <antlr target="${parsers}/antlr.g" outputdirectory="${antlrdir}"/>
--- 44,48 ----
      <antlr target="${parsers}/XQuery/XQueryParser.g" outputdirectory="${xquerydir}"/>
  
!     <property name="antlrdir" value="${java}/antlr"/>
      <mkdir dir="${antlrdir}"/>
      <antlr target="${parsers}/antlr.g" outputdirectory="${antlrdir}"/>
***************
*** 51,58 ****
  
      <!-- Compile the java source code -->
!     <javac srcdir="${src}" destdir="${build}" debug="on" includeAntRuntime="no">
        <classpath>
!         <pathelement location="${build}"/>
!         <fileset dir="${jars}" id="dependency.jar">
            <patternset>
              <include name="**/*.jar"/>
--- 52,59 ----
  
      <!-- Compile the java source code -->
!     <javac srcdir="${java}" destdir="${classes}" debug="on" includeAntRuntime="no">
        <classpath>
!         <pathelement location="${classes}"/>
!         <fileset dir="${lib}" id="dependency.jar">
            <patternset>
              <include name="**/*.jar"/>
***************
*** 64,68 ****
  
      <!-- Copy over the bitmaps -->
!     <copy todir="${build}/graphics">
        <fileset dir="${graphics}"/>
      </copy>
--- 65,69 ----
  
      <!-- Copy over the bitmaps -->
!     <copy todir="${classes}/graphics">
        <fileset dir="${graphics}"/>
      </copy>
***************
*** 71,76 ****
    <target name="clean"
            description="Clean the development artifacts (includes exported source)">
!     <!-- Delete the ${build} and ${dist} directory trees -->
!     <delete dir="${src}"/>
      <delete dir="${build}"/>
    </target>
--- 72,76 ----
    <target name="clean"
            description="Clean the development artifacts (includes exported source)">
!     <delete dir="${java}"/>
      <delete dir="${build}"/>
    </target>
***************
*** 87,91 ****
        <arg value="${test-database}"/>
        <classpath>
!         <pathelement path="${build}"/>
          <fileset refid="dependency.jar"/>
        </classpath>
--- 87,91 ----
        <arg value="${test-database}"/>
        <classpath>
!         <pathelement path="${classes}"/>
          <fileset refid="dependency.jar"/>
        </classpath>
***************
*** 101,105 ****
            description="Prepares files for distribution">
      <mkdir dir="${dist}"/>
!     <jar jarfile="${dist}/sheets.jar" manifest="sheets.mf" basedir="${build}"/>
      <copy todir="${dist}">
        <fileset refid="dependency.jar"/>
--- 101,105 ----
            description="Prepares files for distribution">
      <mkdir dir="${dist}"/>
!     <jar jarfile="${dist}/sheets.jar" manifest="sheets.mf" basedir="${classes}"/>
      <copy todir="${dist}">
        <fileset refid="dependency.jar"/>
***************
*** 109,113 ****
    <target name="bootstrap" depends="dist"
            description="Makes the current distribution the devel version of sheets">
!     <copy file="${dist}/sheets.jar" tofile="${jars}/bootstrap-sheets.jar"/>
    </target>
  
--- 109,113 ----
    <target name="bootstrap" depends="dist"
            description="Makes the current distribution the devel version of sheets">
!     <copy file="${dist}/sheets.jar" tofile="${lib}/bootstrap-sheets.jar"/>
    </target>
  
***************
*** 125,129 ****
  
      <echo>Launching sheets...</echo>
!     <java jar="${jars}/bootstrap-sheets.jar" maxmemory="384m" fork="true">
        <arg line="${arg.extra}"/>
        <arg line="${arg.import}"/>
--- 125,129 ----
  
      <echo>Launching sheets...</echo>
!     <java jar="${lib}/bootstrap-sheets.jar" maxmemory="384m" fork="true">
        <arg line="${arg.extra}"/>
        <arg line="${arg.import}"/>

Index: todo.txt
===================================================================
RCS file: /cvsroot/sheets/sheets/todo.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** todo.txt	27 Nov 2002 04:50:48 -0000	1.1
--- todo.txt	28 Nov 2002 06:54:57 -0000	1.2
***************
*** 7,10 ****
--- 7,11 ----
  
  new bugs:
+ Doesn't persist project root on close/open
  Tab key doesn't work on JDK1.4.1
  Sheets still collapsed on show-in-context for nested fragments

--- LICENSE.txt DELETED ---