[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qsos-commits] qsos/apps/JQEditor build.xml src/org/qsos/main/...
|
From: |
Romain PELISSE |
|
Subject: |
[Qsos-commits] qsos/apps/JQEditor build.xml src/org/qsos/main/... |
|
Date: |
Mon, 07 Aug 2006 09:08:46 +0000 |
CVSROOT: /sources/qsos
Module name: qsos
Changes by: Romain PELISSE <rpelisse> 06/08/07 09:08:46
Modified files:
apps/JQEditor : build.xml
apps/JQEditor/src/org/qsos/main: JQ.java
apps/JQEditor/src/org/qsos/radar: GenerateRadar.java
Log message:
Add task to build final repository
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/JQEditor/build.xml?cvsroot=qsos&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/JQEditor/src/org/qsos/main/JQ.java?cvsroot=qsos&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/JQEditor/src/org/qsos/radar/GenerateRadar.java?cvsroot=qsos&r1=1.2&r2=1.3
Patches:
Index: build.xml
===================================================================
RCS file: /sources/qsos/qsos/apps/JQEditor/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- build.xml 23 Jun 2006 22:07:35 -0000 1.6
+++ build.xml 7 Aug 2006 09:08:46 -0000 1.7
@@ -2,36 +2,56 @@
<!-- project's properties -->
<property name="appname" value="JQEditeur"/>
<property name="lib" value="lib"/>
+ <property name="lib.linux" value="${lib}/linux"/>
+
<property name="src" value="src"/>
<property name="share" value="share"/>
+ <property name="swt.version" value="3232"/>
+
<property name="dist" value="dist"/>
- <property name="dist.windows" value="${dist}/win32"/>
+ <property name="dist.common" value="${dist}/common"/>
+ <property name="dist.common.linux" value="${dist.common}/linux"/>
+ <property name="dist.common.share" value="${dist.common}/share"/>
+
<property name="out" value="out"/>
<property name="out.classes" value="out"/>
- <property name="out.lib" value="out"/>
+ <property name="out.lib" value="out/lib"/>
+ <property name="out.unzipedJars" value="out/unziped"/>
+ <property name="linux.app" value="run.sh"/>
<!-- init -->
<target name="init" depends="clean">
+ <!-- Building tree directory for ouput -->
<mkdir dir="${out}"/>
<mkdir dir="${out.classes}"/>
<mkdir dir="${out.lib}"/>
<mkdir dir="${dist}"/>
-
+ <!-- Common Classpath -->
<path id="classpath">
<fileset dir="${lib}">
<include name="*.jar" />
</fileset>
</path>
+
+ <!-- OS related classpath-->
+ <path id="linux-classpath">
+ <fileset dir="${lib}/linux">
+ <include name="*.*" />
+ </fileset>
+ </path>
</target>
<!-- COMPILE -->
<target name="build" depends="init" description="compil all java
classes">
- <javac compiler="gcj"
+ <javac
+ failonerror="true"
srcdir="${src}"
destdir="${out}">
<classpath refid="classpath" />
+ <classpath refid="linux-classpath" />
</javac>
+
<copy todir="${out}">
<fileset dir="${src}">
<include name="**/*.properties"/>
@@ -39,89 +59,89 @@
</copy>
</target>
+ <!-- unjar a jar-->
+
+ <target name="unjar">
+
+ </target>
+
<!-- JAR -->
<target name="jar-jqeditor" depends="build">
+ <mkdir dir="${out.unzipedJars}"/>
+ <unjar dest="${out.unzipedJars}">
+ <fileset dir="${lib}">
+ <include name="*.jar"/>
+ </fileset>
+ </unjar>
+
<jar destfile="${dist}/jqeditor.jar" >
<manifest>
<attribute name="Built-By" value="${user.name}"/>
- <section name="common">
+ <attribute name="Sealed" value="false"/>
<attribute name="Main-Class"
value="org.qsos.main.JQ"/>
- </section>
</manifest>
<fileset dir="${out.classes}">
<include name="**/*.class"/>
<include name="**/*.properties"/>
</fileset>
-
+ <fileset dir="${out.unzipedJars}">
+ <include name="**/*.*"/>
+ </fileset>
</jar>
- </target>
-
- <!-- all -->
- <target name="all" depends="clean,build">
- <antcall target="jar-jqeditor"/>
- </target>
- <target name="run" description="RUN the program">
- <java classname="org.qsos.main.JQ">
- <classpath>
- <path refid="classpath"/>
- <pathelement location="${dist}/jqeditor.jar"/>
- </classpath>
- </java>
</target>
-
- <!-- Building the app directory for the windows distrib -->
-
- <target name="windows" depends="jar-jqeditor">
- <mkdir dir="${dist.windows}"/>
-
- <property name="target" value="${dist.windows}/${appname}"/>
- <property name="target.src" value="${target}/src"/>
- <property name="target.lib" value="${target}/lib"/>
- <property name="target.share" value="${target}/share"/>
-
- <mkdir dir="${target}"/>
- <mkdir dir="${target.lib}"/>
- <mkdir dir="${target.share}"/>
- <mkdir dir="${target.src}"/>
-
+ <!-- Building the final directory tree -->
+ <target name="common" depends="jar-jqeditor">
+ <mkdir dir="${dist.common}"/>
<!-- Copying source to the app's src dir -->
- <copy todir="${target.src}">
+ <copy todir="${dist.common}/src">
<fileset dir="${src}">
<include name="**/*.java"/>
</fileset>
</copy>
-
<!-- Adding jar to the main directory -->
-
<copy file="${dist}/jqeditor.jar"
- tofile="${target}/jqeditor.jar"/>
-
-
- <copy todir="${target.lib}">
- <fileset dir="${lib}">
- <include name="**/*.jar"/>
+ tofile="${dist.common}/jqeditor.jar"/>
+ <!-- Adding resources -->
+ <copy todir="${dist.common.share}">
+ <fileset dir="${share}">
+ <include name="**/*.png"/>
+ <include name="**/*.bmp"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.ico"/>
</fileset>
</copy>
-
<!-- Adding windows dll for SWT -->
- <copy todir="${target}">
+ <copy todir="${dist.common.share}">
<fileset dir="${share}">
<include name="swt-win32-3139.dll"/>
</fileset>
</copy>
- <!-- Adding resources -->
- <copy todir="${target.share}">
- <fileset dir="${share}">
- <include name="**/*.png"/>
- <include name="**/*.bmp"/>
- <include name="**/*.jpg"/>
- <include name="**/*.ico"/>
+ <!-- Copiyng windows launching script
+ <copy file="" tofile=""/> -->
+ <!-- Adding linux .so archive for SWT -->
+ <copy todir="${dist.common.linux}">
+ <fileset dir="${lib.linux}">
+ <include name="**/*${swt.version}.so"/>
</fileset>
</copy>
+ <!-- Copying linux launching script -->
+ <copy file="${linux.app}"
tofile="${dist.common}/${linux.app}"/>
+
+ </target>
+
+ <!-- Running the app -->
+ <target name="run" description="RUN the program" >
+ <java fork="true"
+ jar="${dist.common}/jqeditor.jar"
+ logerror="true" >
+ <jvmarg
value="-Djava.library.path=./${dist.common.linux}"/>
+ </java>
</target>
+ <!-- Cleanning the directories from products -->
+
<target name="clean">
<delete failonerror="false">
<fileset dir="${dist}"/>
@@ -130,10 +150,11 @@
<delete dir="${dist}"/>
<delete dir="${out}"/>
</target>
-<!--
- <copy todir="${out}">
- <fileset dir="${src}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy> -->
+
+ <!-- all -->
+ <target name="all" depends="clean,build">
+ <antcall target="jar-jqeditor"/>
+ </target>
+
+
</project>
Index: src/org/qsos/main/JQ.java
===================================================================
RCS file: /sources/qsos/qsos/apps/JQEditor/src/org/qsos/main/JQ.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/org/qsos/main/JQ.java 16 Jun 2006 14:16:35 -0000 1.1
+++ src/org/qsos/main/JQ.java 7 Aug 2006 09:08:46 -0000 1.2
@@ -1,5 +1,5 @@
/*
-** $Id: JQ.java,v 1.1 2006/06/16 14:16:35 goneri Exp $
+** $Id: JQ.java,v 1.2 2006/08/07 09:08:46 rpelisse Exp $
**
** Copyright (C) 2006 ESME SUDRIA ( www.esme.fr )
**
@@ -144,6 +144,7 @@
public JQ()
{
super(null);
+ System.out.println("JQ is being run");
addStatusLine();
addCoolBar(SWT.BORDER);
Index: src/org/qsos/radar/GenerateRadar.java
===================================================================
RCS file:
/sources/qsos/qsos/apps/JQEditor/src/org/qsos/radar/GenerateRadar.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/org/qsos/radar/GenerateRadar.java 21 Jun 2006 15:17:08 -0000
1.2
+++ src/org/qsos/radar/GenerateRadar.java 7 Aug 2006 09:08:46 -0000
1.3
@@ -1,5 +1,5 @@
/*
-** $Id: GenerateRadar.java,v 1.2 2006/06/21 15:17:08 rpelisse Exp $
+** $Id: GenerateRadar.java,v 1.3 2006/08/07 09:08:46 rpelisse Exp $
**
** Copyright (C) 2006 ESME SUDRIA ( www.esme.fr )
**
@@ -32,6 +32,7 @@
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTreeViewer;
import org.eclipse.jface.viewers.ICheckStateListener;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.awt.SWT_AWT;
import org.eclipse.swt.graphics.Color;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qsos-commits] qsos/apps/JQEditor build.xml src/org/qsos/main/...,
Romain PELISSE <=