Changeset 1679

Show
Ignore:
Timestamp:
07/06/08 18:07:05 (5 months ago)
Author:
mikey
Message:

RFC #0001: reorganize build

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • forge/star/build

    • Property svn:ignore changed from
      build
       to
      *

  • forge/star/build.php

    r1210 r1679  
    11<?php 
    22$saveDir = getcwd(); 
    3 chdir(dirname(__FILE__) . '/../../'); 
     3chdir(dirname(__FILE__)); 
    44require 'src/main/php/org/stubbles/star/StarException.php'; 
    55require 'src/main/php/org/stubbles/star/StarFile.php'; 

  • forge/star/build.xml

    r1670 r1679  
    11<?xml version="1.0" encoding="utf-8"?> 
    2 <project name="star" default="main"> 
    3   <property name="build.base.dir" value="${stubbles.base.dir}/build/star/build" override="true"/> 
    4   <property name="pkg.dir" value="${stubbles.base.dir}/src/main/php/org/stubbles/star" /> 
     2<project name="star" basedir="." default="main"> 
     3  <property name="pkg.dir" value="src/main/php/org/stubbles/star" /> 
    54  <property name="pkg.name" value="star-${version}"/> 
    6   <property name="build.src.dir" value="${build.base.dir}/${pkg.name}"/> 
     5  <property name="build.src.dir" value="build/${pkg.name}"/> 
    76 
    87  <target name="main" if="version" depends="test,build"/> 
    …… 
    1110 
    1211  <target name="versioncheck" unless="version"> 
    13     <echo message="====================================================="/> 
    14     <echo message="Version not specified. You must enter a version. In"/> 
    15     <echo message="the future you can add this to build.properties or"/> 
    16     <echo message="enter it on the command line: "/> 
    17     <echo message=" "/> 
    18     <echo message="-Dversion=2.0.0b1"/> 
    19     <echo message="====================================================="/> 
    20     <input propertyname="version" promptChar=":">version</input> 
    21  
     12    <php function="file_get_contents" returnProperty="version"> 
     13      <param value="VERSION"/> 
     14    </php> 
     15    <echo>Version to be build: ${version}</echo> 
    2216    <property name="pkg.name" value="star-${version}" override="true"/> 
    23     <property name="build.src.dir" value="${build.base.dir}/${pkg.name}" override="true"/> 
     17    <property name="build.src.dir" value="build/${pkg.name}" override="true"/> 
    2418  </target> 
    2519 
    …… 
    3125    <copy file="${pkg.dir}/StarStreamWrapper.php" tofile="${build.src.dir}/StarStreamWrapper.php" /> 
    3226    <copy file="${pkg.dir}/StarException.php" tofile="${build.src.dir}/StarException.php" /> 
    33     <copy file="${pkg.dir}/LICENSE" tofile="${build.src.dir}/LICENSE" /> 
     27    <copy file="LICENSE" tofile="${build.src.dir}/LICENSE" /> 
    3428    <append destFile="${build.src.dir}/VERSION">star version ${version}</append> 
    3529  </target> 
    …… 
    3933    <echo>| Creating star files       |</echo> 
    4034    <echo>-----------------------------</echo> 
    41     <exec command="php &quot;${stubbles.base.dir}/build/star/build.php&quot; -i &quot;${stubbles.base.dir}/build/star/compile-writer-archive.ini&quot; -t &quot;${build.src.dir}/starWriter.php&quot; -r &quot;${pkg.dir}&quot;" passthru="true" /> 
    42     <exec command="php &quot;${stubbles.base.dir}/build/star/build.php&quot; -i &quot;${stubbles.base.dir}/build/star/compile-writer-cli.ini&quot; -t &quot;${build.src.dir}/starWriter-cli.php&quot; -r &quot;${pkg.dir}&quot;" passthru="true" /> 
    43     <exec command="php &quot;${stubbles.base.dir}/build/star/build.php&quot; -i &quot;${stubbles.base.dir}/build/star/compile-reader.ini&quot; -t &quot;${build.src.dir}/starReader.php&quot; -r &quot;${pkg.dir}&quot;" passthru="true" /> 
     35    <exec command="php &quot;build.php&quot; -i &quot;src/main/resources/build/compile-writer-archive.ini&quot; -t &quot;${build.src.dir}/starWriter.php&quot; -r &quot;${pkg.dir}&quot;" passthru="true" /> 
     36    <exec command="php &quot;build.php&quot; -i &quot;src/main/resources/build/compile-writer-cli.ini&quot; -t &quot;${build.src.dir}/starWriter-cli.php&quot; -r &quot;${pkg.dir}&quot;" passthru="true" /> 
     37    <exec command="php &quot;build.php&quot; -i &quot;src/main/resources/build/compile-reader.ini&quot; -t &quot;${build.src.dir}/starReader.php&quot; -r &quot;${pkg.dir}&quot;" passthru="true" /> 
    4438  </target> 
    4539 
    …… 
    4842    <echo>| Creating TAR packages     |</echo> 
    4943    <echo>-----------------------------</echo> 
    50     <property name="tgzfile" value="${build.base.dir}/${pkg.name}.tgz"/> 
     44    <property name="tgzfile" value="build/${pkg.name}.tgz"/> 
    5145    <delete file="${tgzfile}"/> 
    52     <tar compression="gzip" destFile="${tgzfile}" basedir="${build.base.dir}"> 
    53       <fileset dir="${build.base.dir}"> 
     46    <tar compression="gzip" destFile="${tgzfile}" basedir="build"> 
     47      <fileset dir="build"> 
    5448       <include name="${pkg.name}/**" /> 
    5549      </fileset> 
    …… 
    5852 
    5953  <target name="test" description="run test suite"> 
    60     <exec passthru="true" command="phpunit src_test_php_org_stubbles_star_starTestSuite"/> 
     54    <exec passthru="true" command="phpunit src_test_AllTests"/> 
    6155  </target> 
    6256</project> 

  • forge/star/src/main/resources/build/compile-reader.ini

    r1238 r1679  
    66 
    77[PREFACE] 
    8 preface.1="build/star/preface-reader.php" 
     8preface.1="src/main/resources/build/preface-reader.php" 
    99 
    1010[META-INF] 
    1111title = "Stubbles Archive Reader" 
    1212package = "org::stubbles::star" 
    13 version = "0.7.0" 
     13version = "0.8.0" 
    1414author = "Stubbles Development Team <http://stubbles.net> 
    1515copyright = "© 2007-2008 Stubbles Development Team" 

  • forge/star/src/main/resources/build/compile-writer-archive.ini

    r1238 r1679  
    1010 
    1111[PREFACE] 
    12 preface.1="build/star/preface-writer.php" 
     12preface.1="src/main/resources/build/preface-writer.php" 
    1313 
    1414[META-INF] 
    1515title = "Stubbles Archive Writer" 
    1616package = "org::stubbles::star" 
    17 version = "0.7.0" 
     17version = "0.8.0" 
    1818author = "Stubbles Development Team <http://stubbles.net> 
    1919copyright = "© 2007-2008 Stubbles Development Team" 

  • forge/star/src/main/resources/build/compile-writer-cli.ini

    r1238 r1679  
    1010 
    1111[PREFACE] 
    12 preface.1="build/star/preface-writer.php" 
    13 preface.2="build/star/preface-writer-cli.php" 
     12preface.1="src/main/resources/build/preface-writer.php" 
     13preface.2="src/main/resources/build/preface-writer-cli.php" 
    1414 
    1515[META-INF] 
    1616title = "Stubbles Archive CLI Writer" 
    1717package = "org::stubbles::star" 
    18 version = "0.7.0" 
     18version = "0.8.0" 
    1919author = "Stubbles Development Team <http://stubbles.net> 
    2020copyright = "© 2007-2008 Stubbles Development Team"