Changeset 3079


Ignore:
Timestamp:
Feb 4, 2009, 9:26:20 AM (15 years ago)
Author:
Gregory Vincic
Message:

Fixes #510. Tried doing a ant Package compress and then install the packaged version and it works.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/api/core/build.xml

    r3024 r3079  
    2727  Boston, MA  02111-1307, USA.
    2828-->
    29 <project name="Core API" default="dist">
     29<project name="Core API" default="dist-jar">
    3030  <description>
    3131            Core API
    … …  
    6565  </target>
    6666
    67   <!-- =================================
    68           target: dist             
    69          ================================= -->
    70   <target name="dist" description="--> Core API.">
    71     <mkdir dir="${dist}" />
    72     <jar basedir="${build}" destfile="${dist}/core.jar" includes="**/*.class" />
    73     <jar basedir="${build}" destfile="${dist}/inp2var.jar" manifest="${src}/org/proteios/install/inp2var_mf.txt" includes="org/proteios/install/Input2File.class,
    74                   org/proteios/install/PasswordField.class,
    75                   org/proteios/install/MaskingThread.class" />
    76     <jar basedir="${build}" destfile="${dist}/Replace.jar" manifest="${src}/org/proteios/install/Replace.manifest" includes="org/proteios/install/Replace.class" />
    77     <jar basedir="${build}" destfile="${dist}/GetHostName.jar" manifest="${src}/org/proteios/install/GetHostName.manifest" includes="org/proteios/install/GetHostName.class" />
    78   </target>
    7967
    8068  <!-- - - - - - - - - - - - - - - - - -

  • trunk/build.xml

    r3025 r3079  
    8686        target: package                     
    8787     - - - - - - - - - - - - - - - - - -->
    88   <target name="package" description="Same as 'ant clean compile hibernate dist'" depends="clean, compile, hibernate, dist-jar">
     88  <target name="package" description="Same as 'ant clean compile hibernate dist-jar'" depends="clean, compile, hibernate, dist-jar">
    8989  </target>
    9090
    … …  
    190190  </target>
    191191
    192   <!-- - - - - - - - - - - - - - - - - -
    193       target: dist                     
    194      - - - - - - - - - - - - - - - - - -->
    195   <target name="dist">
    196     <mkdir dir="${dist}" />
    197     <subcall target="dist" />
    198     <!-- Old distribution way -->
    199     <mkdir dir="${dist}/www/WEB-INF/lib" />
    200     <mkdir dir="${dist}/www/WEB-INF/classes" />
    201     <!-- Copy all files needed to create a package -->
    202     <copy file="api/core/dist/Replace.jar" todir="${dist}" />
    203     <copy file="api/core/dist/inp2var.jar" todir="${dist}" />
    204     <copy file="api/core/dist/GetHostName.jar" todir="${dist}" />
    205     <copy todir="${dist}">
    206       <fileset dir="misc/install">
    207         <include name="*" />
    208       </fileset>
    209     </copy>
    210     <copy todir="${dist}/www/WEB-INF/">
    211       <fileset dir="client/servlet/conf">
    212         <include name="web.xml*" />
    213       </fileset>
    214     </copy>
    215     <copy todir="${dist}/www/WEB-INF/lib">
    216       <fileset dir="api/external">
    217         <include name="*.jar" />
    218         <exclude name="servletapi-2.3.jar" />
    219         <exclude name="jsp-api.jar" />
    220       </fileset>
    221       <fileset dir="api/external">
    222         <include name="jai" />
    223       </fileset>
    224     </copy>
    225     <copy todir="${dist}/www/WEB-INF/classes">
    226       <fileset dir="api/core/build">
    227         <include name="**" />
    228       </fileset>
    229       <fileset dir="api/core/conf">
    230         <include name="**" />
    231       </fileset>
    232       <fileset dir="api/waf/build">
    233         <include name="**" />
    234       </fileset>
    235       <fileset dir="client/ftpd/build">
    236         <include name="**" />
    237       </fileset>
    238       <fileset dir="client/ftpd/conf">
    239         <include name="**" />
    240       </fileset>
    241       <fileset dir="client/servlet/build">
    242         <include name="**" />
    243       </fileset>
    244       <fileset dir="client/servlet/conf">
    245         <include name="log4j.properties*" />
    246         <include name="proteios.config*" />
    247         <include name="mascot.properties*" />
    248         <include name="omssa.properties*" />
    249         <include name="omssa_default_iontrap.xml" />
    250         <include name="omssa_default_etd.xml" />
    251         <include name="pike.properties*" />
    252         <include name="xtandem.properties*" />
    253         <include name="xtandem_default_input.xml" />
    254       </fileset>
    255       <fileset dir="plugin/build">
    256         <include name="**" />
    257       </fileset>
    258       <fileset dir="plugin/conf">
    259         <include name="**" />
    260       </fileset>
    261     </copy>
    262     <copy todir="${dist}/www">
    263       <fileset dir="client/servlet/www">
    264         <exclude name="**/static/img/orig/**" />
    265       </fileset>
    266       <fileset dir="client/servlet/www/static/img">
    267         <include name="favicon.ico" />
    268       </fileset>
    269     </copy>
    270     <copy todir="${dist}">
    271       <fileset dir="client/ftpd">
    272         <include name="proteios_ftp_server*" />
    273       </fileset>
    274     </copy>
    275     <mkdir dir="${dist}/licenses" />
    276     <copy todir="${dist}/licenses">
    277       <fileset dir="doc/licenses"/>
    278     </copy>
    279     <copy todir="${dist}">
    280       <fileset dir=".">
    281         <include name="credits.txt"/>
    282       </fileset>   
    283     </copy>
    284 
    285     <chmod file="${dist}/*.sh" perm="ugo+rx" />
    286   </target>
    287 
    288192  <target name="hibernate" description="Just forwards to cores hibernate target">
    289193    <ant dir="api/core" target="hibernate" inheritAll="false" />

  • trunk/client/ftpd/build.xml

    r2504 r3079  
    2727  Boston, MA  02111-1307, USA.
    2828-->
    29 <project name="Proteios FTP server" default="dist">
     29<project name="Proteios FTP server" default="dist-jar">
    3030  <description>
    3131            FTP server
    … …  
    5656  </target>
    5757
    58   <!-- =================================
    59           target: dist             
    60          ================================= -->
    61   <target name="dist" description="--> FTP server">
    62     <mkdir dir="${dist}" />
    63     <!-- Build jar file -->
    64     <jar basedir="${build}" destfile="${dist}/ftpserver.jar" includes="**/*.class" manifest="Manifest"/>
    65 
    66   </target>
    6758
    6859  <!-- - - - - - - - - - - - - - - - - -

  • trunk/client/servlet/build.xml

    r2949 r3079  
    2727  Boston, MA  02111-1307, USA.
    2828-->
    29 <project name="Proteios Servlet" default="dist">
     29<project name="Proteios Servlet" default="dist-jar">
    3030  <description>
    3131            Graphical interface of proteios.
    … …  
    6262  </target>
    6363
    64   <!-- =================================
    65           target: dist             
    66          ================================= -->
    67   <target name="dist" description="--> Proteios Servlet">
    68     <mkdir dir="${dist}" />
    69   </target>
    7064
    7165  <!-- =================================
    7266        target: package             
    7367       ================================= -->
    74   <target name="package" depends="clean, compile, dist" description="--> Proteios Servlet">
     68  <target name="package" depends="clean, compile, dist-jar" description="--> Proteios Servlet">
    7569    <!-- Build war file -->
    7670    <war destfile="${dist}/proteios.war" webxml="conf/web.xml">
Note: See TracChangeset for help on using the changeset viewer.