From: <and...@us...> - 2008-08-24 18:58:44
|
Revision: 503 http://ggc.svn.sourceforge.net/ggc/?rev=503&view=rev Author: andyrozman Date: 2008-08-24 18:58:48 +0000 (Sun, 24 Aug 2008) Log Message: ----------- Modified Paths: -------------- trunk/ggc/build/GGCBuild.properties_default trunk/ggc/build/build.xml trunk/ggc/src/How_Can_I_Help.txt trunk/ggc-meter/build/GGCMeterToolVersion.properties trunk/ggc-meter/build/build.xml Added Paths: ----------- trunk/build/ trunk/build/build.xml trunk/ggc-plugin_base/build/ trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties trunk/ggc-plugin_base/build/GGCPlugInBaseVersion.properties trunk/ggc-plugin_base/build/build.xml Added: trunk/build/build.xml =================================================================== --- trunk/build/build.xml (rev 0) +++ trunk/build/build.xml 2008-08-24 18:58:48 UTC (rev 503) @@ -0,0 +1,95 @@ +<?xml version="1.0" ?> +<project name="GNU Gluco Control" default="build" basedir="."> + <description> + Main Build file for GGC + </description> + + <!-- Environment properties read from a file ...--> + <property file="./GGCBuild.properties"/> + <property file="./GGCVersion.properties"/> + + + <!-- These should *not* be modified on the command line! --> + <property name="build.dir" value="${outdir.dir}/classes"/> + <property name="deploy.dir" value="${outdir.dir}/deploy"/> + + + <!-- Build GGC --> + + <target name="build"> + <echo message=" ************************************************* "/> + <echo message=" **** GGC Full Build **** "/> + <echo message=" ************************************************* "/> + <echo message=""/> + <echo message=" all = whole GGC"/> + <echo message=" all_noclean = whole GGC (no clean)"/> + <echo message=" ggc = GNU Gluco Control application build (full)"/> + <echo message=" plugins = create all plugins"/> + <echo message=" plugin_base = create GGC Base Plugin"/> + <echo message=" plugin_meter = create GGC Meter Tool (needs Base)"/> + <echo message=" plugin_pump = create GGC Pump Tool"/> + <echo message=" plugin_cgms = create GGC CGMS Plugin"/> + <echo message=" clean = clean directory"/> + <echo message=""/> + </target> + + + <!-- Public targets --> + + <target name="clean" description="clean"> + <delete> + <fileset dir="./deploy_files"> + <include name="**"/> + </fileset> + </delete> + </target> + + <target name="all" depends="clean, all_noclean" description="whole GGC"> + </target> + + <target name="all_noclean" depends="ggc, plugins" description="whole GGC"> + </target> + + + <target name="ggc" description="GNU Gluco Control application build (full)"> + <echo message=""/> + <echo message=" Start GGC build"/> + <echo message=""/> + <subant target="deploy"> + <fileset dir="../ggc" includes="*/build.xml" /> + </subant> + </target> + + <target name="plugins" depends="plugin_base, plugin_meter, plugin_pump, plugin_cgms" description="create all plugins"> + </target> + + <target name="plugin_base" description="create PlugIn Base"> + <echo message=""/> + <echo message=" Start GGC Base Plugin build"/> + <echo message=""/> + <subant target="deploy"> + <fileset dir="../ggc-plugin_base" includes="*/build.xml" /> + </subant> + </target> + + <target name="plugin_meter" depends="plugin_base" description="create GGC Meter Tool (needs Base)"> + <echo message=""/> + <echo message=" Start GGC Base Plugin build"/> + <echo message=""/> + </target> + + <target name="plugin_pump" description="create GGC Pump Tool"> + <echo message=""/> + <echo message=" Start GGC Base Plugin build"/> + <echo message=""/> + </target> + + <target name="plugin_cgms" description="create GGC CGMS Plugin"> + <echo message=""/> + <echo message=" Start GGC Base Plugin build"/> + <echo message=""/> + </target> + + +</project> + Property changes on: trunk/build/build.xml ___________________________________________________________________ Added: svn:executable + * Modified: trunk/ggc/build/GGCBuild.properties_default =================================================================== --- trunk/ggc/build/GGCBuild.properties_default 2008-08-24 14:22:06 UTC (rev 502) +++ trunk/ggc/build/GGCBuild.properties_default 2008-08-24 18:58:48 UTC (rev 503) @@ -23,9 +23,16 @@ # build.dir = output for .class files build.dir=${outdir.dir}/build/classes + + + # set this if you use database that is not our default one (HypersonicSQL) additional.jdbc.driver=${jdbc_path}/some.jdbc.driver.jar + + + + # # STATIC (this is required lib tree) # DO NOT CHANGE !!! @@ -33,7 +40,6 @@ jdbc_path=${library.dir}/jdbc/ hibernate_path=${library.dir}/hibernate3 utils_path=${library.dir}/utils -comunication.api_ibm=${utils_path}/RXTXcomm.jar # # Path to your communication api. Here you must set path to jar contating your communication @@ -41,10 +47,43 @@ # comunication.api=${comunication.api_ibm} + + + + # +# Special libraries settings +# + +# +# Path to your communication api. Here you must set path to jar contating your communication +# api +# +comunication.api=${utils_path}/RXTXcomm.jar + +# +# atech-tools +# +atech-tools.api=${utils_path}/atech-tools-0.2.4.jar + +# +# pygmy (internal web server) +# +pygmy.api=${utils_path}/ + + +# Change following settings to reflect atech-tools version (do this only if latest version of atech-tools +# has changed) +# +atech-tool.api=${utils_path}/atech-tools-0.2.1.jar + + + + +# ### STOP EDITING HERE # -utils_cpath=${utils_path}/iText-2.0.7.jar;${utils_path}/skinlf-6.7.jar;${comunication.api};${utils_path}/atech-tools-0.1.8.jar +utils_cpath=${utils_path}/iText-2.0.7.jar;${utils_path}/skinlf-6.7.jar;${comunication.api};${atech-tools.api} hibernate_cpath=${hibernate_path}/asm.jar;${hibernate_path}/asm-attrs.jar;${hibernate_path}/c3p0-0.9.0.jar;${hibernate_path}/cglib-2.1.3.jar;${hibernate_path}/commons-collections-2.1.1.jar;${hibernate_path}/commons-logging-1.0.4.jar;${hibernate_path}/dom4j-1.6.1.jar;${hibernate_path}/hibernate3.jar;${hibernate_path}/jdbc2_0-stdext.jar;${hibernate_path}/jta.jar;${hibernate_path}/log4j-1.2.11.jar;${hibernate_path}/ehcache-1.1.jar;${hibernate_path}/commons-lang-2.0.jar;${hibernate_path}/antlr-2.7.6rc1.jar jdbc_cpath=${jdbc_path}\hsqldb.jar;${additional.jdbc.driver} \ No newline at end of file Modified: trunk/ggc/build/build.xml =================================================================== --- trunk/ggc/build/build.xml 2008-08-24 14:22:06 UTC (rev 502) +++ trunk/ggc/build/build.xml 2008-08-24 18:58:48 UTC (rev 503) @@ -29,6 +29,7 @@ <echo message=" available parts are: core, lang, little, main"/> <echo message=" jars_full = all jars"/> <echo message=" full = clean, build_ggc, copy, jars_full"/> + <echo message=" deploy = full, copy files to main directory"/> <echo message=" dist = full, and create distribution zip file (contains needed libs, and data files)" /> <echo message=" style (_devel, _deploy) = checkstyle against our rules" /> <echo message=""/> @@ -177,6 +178,14 @@ <target name="full" depends="clean, copy, jars_full"> </target> + <target name="deploy" depends="full"> + <copy file="${binary.dir}/ggc-core-${ggc-core.version}.jar" todir="../../build/deploy_files/"/> + <copy file="${binary.dir}/ggc-main-${ggc-main.version}.jar" todir="../../build/deploy_files/"/> + <copy file="${binary.dir}/ggc-lang-${ggc-lang.version}.jar" todir="../../build/deploy_files/"/> + <copy file="${binary.dir}/ggc-little-${ggc-little.version}.jar" todir="../../build/deploy_files/"/> + </target> + + <target name="dist"> <echo message="This option is not available yet." /> </target> Modified: trunk/ggc/src/How_Can_I_Help.txt =================================================================== --- trunk/ggc/src/How_Can_I_Help.txt 2008-08-24 14:22:06 UTC (rev 502) +++ trunk/ggc/src/How_Can_I_Help.txt 2008-08-24 18:58:48 UTC (rev 503) @@ -172,7 +172,7 @@ Install subclipse: (you need to do this step before you go to 3. Go to Help -> Software Updates. Tab Available software, click on add site. - Add following site url: http://subclipse.tigris.org/update_1.0.x + Add following site url: http://subclipse.tigris.org/update_1.4.x Wait few seconds that entry is added and file list downloaded. Select Subclipse plugin. 3.) Create new workspace. Add Libraries. Libraries are stored under ggc-support/eclipse. You need to @@ -182,11 +182,11 @@ Open Windows->Preferences. Go to group Java->Code style->Formatter. Use Import option and add xml file stored under ggc-support/eclipse. -4.) Import all projects (atech-tools, ggc, ggc-meter, ggc-pump, ggc-cgm) +4.) Import all projects (atech-tools, ggc, ggc-meter, ggc-pump, ggc-cgm, ggc-plugin_base) Use File->Import..., select General->Existing project into workspace and find all upper directories - You should have 5 projects. + You should have 6 projects. 5.) Run GGC Modified: trunk/ggc-meter/build/GGCMeterToolVersion.properties =================================================================== --- trunk/ggc-meter/build/GGCMeterToolVersion.properties 2008-08-24 14:22:06 UTC (rev 502) +++ trunk/ggc-meter/build/GGCMeterToolVersion.properties 2008-08-24 18:58:48 UTC (rev 503) @@ -6,5 +6,5 @@ # # GGC Meter Tool Version # -ggc-meter-tool.version=0.1.2 +ggc-meter-tool.version=0.3.4 Modified: trunk/ggc-meter/build/build.xml =================================================================== --- trunk/ggc-meter/build/build.xml 2008-08-24 14:22:06 UTC (rev 502) +++ trunk/ggc-meter/build/build.xml 2008-08-24 18:58:48 UTC (rev 503) @@ -1,35 +1,34 @@ <?xml version="1.0" ?> -<project name="GNU Gluco Control" default="build" basedir="."> +<project name="GNU PlugIn Base" default="build" basedir="."> <description> Build file for GGC </description> <!-- Environment properties read from a file ...--> - <property file="./GGCBuild.properties"/> - <property file="./GGCVersion.properties"/> - - + <property file="../../ggc-plugin_base/GGCPlugInBaseBuild.properties"/> + <property file="./GGCMeterToolVersion.properties"/> + <!-- These should *not* be modified on the command line! --> <property name="build.dir" value="${outdir.dir}/classes"/> <property name="deploy.dir" value="${outdir.dir}/deploy"/> - + <property name="jar_file_name" value="ggc-meter_tool" /> + <property name="jar_file_version" value="${ggc-plugin-base.version}" /> + + + <!-- Build GGC --> <target name="build"> <echo message=" ************************************************* "/> - <echo message=" **** GGC Meter Tool Build **** "/> + <echo message=" **** GGC PlugIn Base Build **** "/> <echo message=" ************************************************* "/> <echo message=""/> - <echo message=" copy = copies all needed files"/> <echo message=" clean = clean build dir"/> - <echo message=" build_ggc (make) = build GGC (recompile classes)"/> - <echo message=" jar = create GGC jar"/> - <echo message=" jar_core = create GGC Core jar"/> - <echo message=" jar_l = create GGC Little jar"/> - <echo message=" full = clean, build_ggc, copy, jar, jar_l"/> - <echo message=" dist = full, and create distribution zip file (contains needed libs, and data files)" /> - <echo message=" style (_devel, _deploy) = checkstyle against our rules" /> + <echo message=" compile = build GGC PlugIn Base"/> + <echo message=" jar = create GGC PlugIn Base jar"/> + <echo message=" full = compile,jar GGC PlugIn Base"/> + <echo message=" deploy = full plus deploy in main (GGC PlugIn Base)"/> <echo message=""/> </target> @@ -37,22 +36,21 @@ <!-- Public targets --> <target name="clean" description="Clean build directory and previus version of GGC"> - <delete dir="${build.dir}/ggc"/> - <delete dir="${build.dir}/icons"/> - <delete file="${build.dir}/ggc.jar"/> + <delete dir="${binary.dir}"/> + <mkdir dir="${binary.dir}" /> </target> <target name="copy" description="Copy all needed files"> - <mkdir dir="${build.dir}" /> - <copy todir="${build.dir}/" overwrite="true"> + <mkdir dir="${binary.dir}" /> + <copy todir="${binary.dir}/" overwrite="true"> <fileset dir="${source.dir}" casesensitive="no"> <include name="*.properties"/> </fileset> </copy> - <mkdir dir="${build.dir}/icons" /> - <copy todir="${build.dir}/icons" overwrite="true"> - <fileset dir="${source.dir}/icons" casesensitive="no"> + <mkdir dir="${binary.dir}/icons" /> + <copy todir="${binary.dir}/icons" overwrite="true"> + <fileset dir="../src/icons" casesensitive="no"> <include name="**/*.gif"/> <include name="**/*.jpg"/> <include name="**/*.png"/> @@ -62,17 +60,14 @@ - - <target name="make" description="Build GGC"> - <mkdir dir="${build.dir}" /> + <target name="compile" depends="copy" description="Build GGC"> + <mkdir dir="${deploy.dir}" /> <javac srcdir="${source.dir}" - destdir="${build.dir}" - includes="ggc/meter/**" - deprecation="off" debug="true"> <!-- debug="${debug} DummyHandler.java, ggc/db/HSQLHandler.java, ggc\db\MySQLHandler, ggc/db/TextFileHandler.java" --> - + destdir="${binary.dir}" + includes="ggc/**" + deprecation="off" debug="true"> <classpath> - <pathelement path="${comunication.api}" /> - <pathelement path="${atech-tool.api}"/> + <pathelement path="${classpath.full}" /> </classpath> </javac> </target> @@ -83,23 +78,19 @@ includes="ggc/**" excludes="ggc/db/**" +jar_file_version - --> - <target name="jar" depends="jar_meter_tool" /> - - <target name="jar_meter_tool" description="Build GGC Core" depends="make"> - <jar jarfile="${binary.dir}/ggc-meter-tool-${ggc-meter-tool.version}.jar" + <target name="jar" description="Create jar files" depends="compile"> + <jar jarfile="${deploy.dir}/${jar_file_name}-${jar_file_version}.jar" update="false" index="false" - manifest="./manifest_ggc_core.mf"> + > - <fileset dir="${build.dir}"> - <include name="ggc/meter/**"/> - <include name="ggc/data/**"/> - <include name="ggc/gui/**"/> + <fileset dir="${binary.dir}"> + <include name="ggc/**"/> </fileset> <fileset dir="${source.dir}"> <include name="*.properties"/> @@ -109,47 +100,13 @@ </target> - - <target name="dev" depends="clean, copy, make"> + <target name="full" depends="clean, jar"> </target> - - - - <target name="full" depends="clean, copy, jar_meter_tool"> + + <target name="deploy" depends="clean, jar"> + <copy file="${deploy.dir}/${jar_file_name}-${jar_file_version}.jar" todir="../../build/deploy_files/"/> </target> - <target name="dist"> - <echo message="This option is not available yet." /> - </target> - - <target name="style_deploy"> - <taskdef resource="checkstyletask.properties" classpath="${library.dir}/devel/checkstyle-all-4.1.jar" /> - - <checkstyle config="ggc_deploy.xml"> - <fileset dir="${source.dir}" includes="**/*.java"/> - - <formatter type="plain"/> - <formatter type="xml" toFile="checkstyle_errors.xml"/> - </checkstyle> - - </target> - - <target name="style_devel"> - <taskdef resource="checkstyletask.properties" classpath="${library.dir}/devel/checkstyle-all-4.1.jar" /> - - <checkstyle config="ggc_devel.xml"> - <fileset dir="${source.dir}" includes="**/*.java"/> - - <formatter type="plain"/> - <formatter type="xml" toFile="checkstyle_errors.xml"/> - </checkstyle> - </target> - - - - - </project> - Added: trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties =================================================================== --- trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties (rev 0) +++ trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties 2008-08-24 18:58:48 UTC (rev 503) @@ -0,0 +1,77 @@ +# +# GNU PligIn Base (Ant Build file) +# +# + + +# Change this settings to reflect your paths +# + +# output.dir = where output files (classes) and files will be put +#outdir.dir=d:/My_Projects/GNUGlucoCenter/ggc +outdir.dir=. + +# binary.dir = where output files (jars) will be places +binary.dir=../bin + +deploy.dir=./deploy + +# source.dir = location of source files +source.dir=../src + +# library.dir = location of lib root (ggc-support should always be used) +library.dir=../../ggc-support/lib + +# build.dir = output for .class files +build.dir=${outdir.dir}/classes + +# set this if you use database that is not our default one (HypersonicSQL) +additional.jdbc.driver=${jdbc_path}/some.jdbc.driver.jar + +# +# STATIC (this is required lib tree) +# DO NOT CHANGE - Start +# +jdbc_path=${library.dir}/jdbc/ +hibernate_path=${library.dir}/hibernate3 +utils_path=${library.dir}/utils + +# +# DO NOT CHANGE - End +# + +# +# Libs (running of application is regulated by startup/update classes, but build isn't. We need to add all files +# needed for compile manually) +# + + +# +# Path to your communication api. Here you must set path to jar contating your communication +# api +# +comunication.api=${utils_path}/RXTXcomm.jar + + + +# Change following settings to reflect atech-tools version (do this only if latest version of atech-tools +# has changed) +# +atech-tools.api=${utils_path}/atech-tools-0.2.4.jar + + + +# +### STOP EDITING HERE +# + +utils_cpath=${comunication.api};${atech-tools.api} +hibernate_cpath=${hibernate_path}/asm.jar;${hibernate_path}/asm-attrs.jar;${hibernate_path}/c3p0-0.9.0.jar;${hibernate_path}/cglib-2.1.3.jar;${hibernate_path}/commons-collections-2.1.1.jar;${hibernate_path}/commons-logging-1.0.4.jar;${hibernate_path}/dom4j-1.6.1.jar;${hibernate_path}/hibernate3.jar;${hibernate_path}/jdbc2_0-stdext.jar;${hibernate_path}/jta.jar;${hibernate_path}/log4j-1.2.11.jar;${hibernate_path}/ehcache-1.1.jar;${hibernate_path}/commons-lang-2.0.jar;${hibernate_path}/antlr-2.7.6rc1.jar +jdbc_cpath=${jdbc_path}\hsqldb.jar;${additional.jdbc.driver} + + +# +# Full Path (add library main entries here) +# + +classpath.full=${utils_cpath};${hibernate_cpath};${jdbc_cpath};${javahelp.api};${tray.api} Property changes on: trunk/ggc-plugin_base/build/GGCPlugInBaseBuild.properties ___________________________________________________________________ Added: svn:executable + * Added: trunk/ggc-plugin_base/build/GGCPlugInBaseVersion.properties =================================================================== --- trunk/ggc-plugin_base/build/GGCPlugInBaseVersion.properties (rev 0) +++ trunk/ggc-plugin_base/build/GGCPlugInBaseVersion.properties 2008-08-24 18:58:48 UTC (rev 503) @@ -0,0 +1,10 @@ +# +# Version properties for GGC PlugIn Base +# + + +# +# GGC PlugIn Base Version +# +ggc-plugin-base.version=0.1.5 + Property changes on: trunk/ggc-plugin_base/build/GGCPlugInBaseVersion.properties ___________________________________________________________________ Added: svn:executable + * Added: trunk/ggc-plugin_base/build/build.xml =================================================================== --- trunk/ggc-plugin_base/build/build.xml (rev 0) +++ trunk/ggc-plugin_base/build/build.xml 2008-08-24 18:58:48 UTC (rev 503) @@ -0,0 +1,114 @@ +<?xml version="1.0" ?> +<project name="GNU PlugIn Base" default="build" basedir="."> + <description> + Build file for GGC + </description> + + <!-- Environment properties read from a file ...--> + <property file="./GGCPlugInBaseBuild.properties"/> + <property file="./GGCPlugInBaseVersion.properties"/> + + + <!-- These should *not* be modified on the command line! --> + <property name="build.dir" value="${outdir.dir}/classes"/> + <property name="deploy.dir" value="${outdir.dir}/deploy"/> + + <property name="jar_file_name" value="ggc-plugin_base" /> + <property name="jar_file_version" value="${ggc-plugin-base.version}" /> + + + + <!-- Build GGC --> + + <target name="build"> + <echo message=" ************************************************* "/> + <echo message=" **** GGC PlugIn Base Build **** "/> + <echo message=" ************************************************* "/> + <echo message=""/> + <echo message=" clean = clean build dir"/> + <echo message=" compile = build GGC PlugIn Base"/> + <echo message=" jar = create GGC PlugIn Base jar"/> + <echo message=" full = compile,jar GGC PlugIn Base"/> + <echo message=" deploy = full plus deploy in main (GGC PlugIn Base)"/> + <echo message=""/> + </target> + + + <!-- Public targets --> + + <target name="clean" description="Clean build directory and previus version of GGC"> + <delete dir="${binary.dir}"/> + <mkdir dir="${binary.dir}" /> + </target> + + + <target name="copy" description="Copy all needed files"> + <mkdir dir="${build.dir}" /> + <copy todir="${build.dir}/" overwrite="true"> + <fileset dir="${source.dir}" casesensitive="no"> + <include name="*.properties"/> + </fileset> + </copy> + <mkdir dir="../bin/icons" /> + <copy todir="../bin/icons" overwrite="true"> + <fileset dir="../src/icons" casesensitive="no"> + <include name="**/*.gif"/> + <include name="**/*.jpg"/> + <include name="**/*.png"/> + </fileset> + </copy> + </target> + + + + <target name="compile" description="Build GGC"> + <mkdir dir="${deploy.dir}" /> + <javac srcdir="${source.dir}" + destdir="${binary.dir}" + includes="ggc/**" + deprecation="off" debug="true"> + <classpath> + <pathelement path="${classpath.full}" /> + </classpath> + </javac> + </target> + + +<!-- + <target name="build_ggc" description="Build GGC" /> + + includes="ggc/**" + excludes="ggc/db/**" +jar_file_version + +--> + + + <target name="jar" description="Create jar files" depends="compile"> + <jar jarfile="${deploy.dir}/${jar_file_name}-${jar_file_version}.jar" + update="false" + index="false" + > + + <fileset dir="${binary.dir}"> + <include name="ggc/**"/> + </fileset> + <fileset dir="${source.dir}"> + <include name="*.properties"/> + </fileset> + + </jar> + </target> + + + <target name="full" depends="clean, jar"> + </target> + + + <target name="deploy" depends="clean, jar"> + <copy file="${deploy.dir}/${jar_file_name}-${jar_file_version}.jar" todir="../../build/deploy_files/"/> + </target> + + +</project> + Property changes on: trunk/ggc-plugin_base/build/build.xml ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |