Author: linus
Date: 2010-12-06 09:40:00-0800
New Revision: 18891
Added:
trunk/src/argouml-app/src/org/argouml/application/ArgoVersion.java
Removed:
trunk/src/argouml-app/.externalToolBuilders/
trunk/src/argouml-app/src/templates/ArgoVersion.template
Modified:
trunk/src/argouml-app/.project
trunk/src/argouml-app/build.xml
trunk/src/argouml-app/src/org/argouml/application/ (props changed)
trunk/src/argouml-app/src/templates/manifest.template
Log:
Removed the special processing of the version from default.properties to org.argouml.application.ArgoVersion.
It is now set explicitly in the java file.
Modified: trunk/src/argouml-app/.project
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/.project?view=diff&pathrev=18891&r1=18890&r2=18891
==============================================================================
--- trunk/src/argouml-app/.project (original)
+++ trunk/src/argouml-app/.project 2010-12-06 09:40:00-0800
@@ -1,53 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>argouml-app</name>
- <comment></comment>
- <projects>
- <project>argouml-core-diagrams-sequence2</project>
- <project>argouml-core-model</project>
- <project>argouml-core-tools</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Generate version and parsers [Builder].launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>de.mvmsoft.checkclipse.CheckclipseBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>argouml-app</name>
+ <comment></comment>
+ <projects>
+ <project>argouml-core-diagrams-sequence2</project>
+ <project>argouml-core-model</project>
+ <project>argouml-core-tools</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>de.mvmsoft.checkclipse.CheckclipseBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>de.mvmsoft.checkclipse.CheckclipseNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>de.mvmsoft.checkclipse.CheckclipseNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- </natures>
-</projectDescription>
+ </natures>
+</projectDescription>
Modified: trunk/src/argouml-app/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/build.xml?view=diff&pathrev=18891&r1=18890&r2=18891
==============================================================================
--- trunk/src/argouml-app/build.xml (original)
+++ trunk/src/argouml-app/build.xml 2010-12-06 09:40:00-0800
@@ -105,16 +105,8 @@
<!-- In order to use ant optional tasks which use jars that are not -->
<!-- copied into ANT_HOME/lib, we must declare the tasks ourselves. -->
- <property name="Name" value="ArgoUML"/>
<property name="name" value="argouml"/>
- <property name="argo.build.version" value="${argo.core.version}"/>
-
- <property name="argo.timestamp.version"
- value="${argo.build.version}-${DSTAMP}-${TSTAMP}"/>
-
- <property name="version.package" value="org/argouml/application"/>
-
<property name="cobertura.dir" value="${argo.tools.dir}/cobertura-1.9" />
<property name="cobertura.datafile" value="${build.dir}/cobertura.ser" />
<path id="cobertura.classpath">
@@ -169,7 +161,7 @@
<!-- Prepares the build directory -->
<!-- =================================================================== -->
- <target name="prepare" depends="init,check-version">
+ <target name="prepare" depends="init">
<!-- create directories -->
<echo message="Preparing the build directories in argouml-app"/>
<mkdir dir="${build.dir}"/>
@@ -214,36 +206,10 @@
</target>
<!-- =================================================================== -->
- <!-- Updates the version source file if necessary -->
- <!-- =================================================================== -->
- <target name="check-version" depends="init">
- <uptodate property="version.is.current"
- targetfile="src/${version.package}/ArgoVersion.java">
- <srcfiles dir="src/templates">
- <include name="ArgoVersion.template"/>
- </srcfiles>
- <srcfiles dir="src">
- <include name="default.properties"/>
- <include name="build.properties"/>
- </srcfiles>
- </uptodate>
- </target>
-
- <target name="update-version" depends="check-version"
- unless="version.is.current">
- <echo message="Creating ArgoVersion.java for version ${argo.build.version} in argouml-app"/>
- <filter token="ARGO_RELEASE_VERSION" value="${argo.build.version}"/>
- <copy file="src/templates/ArgoVersion.template"
- filtering="on"
- overwrite="on"
- tofile="src/${version.package}/ArgoVersion.java"/>
- </target>
-
- <!-- =================================================================== -->
<!-- Compiles the source directory -->
<!-- =================================================================== -->
<target name="compile"
- depends="prepare,update-version"
+ depends="prepare"
description="Compile the sources.">
<echo message="Compiling the sources in argouml-app"/>
@@ -271,8 +237,7 @@
<!-- =================================================================== -->
<target name="jar" depends="compile"
description="Build the main jar file.">
- <filter token="version" value="${argo.build.version}"/>
- <copy file="src/templates/manifest.template" filtering="on"
+ <copy file="src/templates/manifest.template"
overwrite="on"
tofile="${build.classes}/manifest.mf"/>
<jar basedir="${build.classes}"
@@ -303,7 +268,6 @@
description="Clean out all built files.">
<delete dir="${build.dir}"/>
- <delete file="src/${version.package}/ArgoVersion.java"/>
<antcall target="coverage-clean"/>
<antcall target="pde-clean" />
Added: trunk/src/argouml-app/src/org/argouml/application/ArgoVersion.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/application/ArgoVersion.java?view=markup&pathrev=18891
==============================================================================
--- (empty file)
+++ trunk/src/argouml-app/src/org/argouml/application/ArgoVersion.java 2010-12-06 09:40:00-0800
@@ -0,0 +1,75 @@
+/* $Id: ArgoVersion.template 18387 2010-05-09 20:34:01Z linus $
+ *******************************************************************************
+ * Copyright (c) 2009 Contributors - see below
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Tom Morris
+ *******************************************************************************
+ *
+ * Some portions of this file was previously release using the BSD License:
+ */
+
+// Copyright (c) 1996-2008 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
+// agreement is hereby granted, provided that the above copyright notice
+// and this paragraph appear in all copies. This software program and
+// documentation are copyrighted by The Regents of the University of
+// California. The software program and documentation are supplied "AS
+// IS", without any accompanying services from The Regents. The Regents
+// does not warrant that the operation of the program will be
+// uninterrupted or error-free. The end-user understands that the program
+// was developed for research purposes and is advised not to rely
+// exclusively on the program for any reason. IN NO EVENT SHALL THE
+// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
+// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
+// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+package org.argouml.application;
+
+import org.argouml.application.helpers.ApplicationVersion;
+
+/**
+ * This class <strong>only</strong> encapsulates the ArgoUML version string.<p>
+ *
+ * It should <strong>not</strong> be edited manually because it is
+ * build from the file ArgoVersion.template when necessary.<p>
+ *
+ * Since this class resides in the top-level package,
+ * none of its functionality should be used
+ * outside this package.
+ *
+ * @author Thierry Lach
+ * @since Argo0.11.1
+ */
+final class ArgoVersion {
+ /**
+ * Version number.
+ */
+ private static final String VERSION = "PRE-0.31.8";
+ private static final String STABLE_VERSION = "0.28";
+
+ /**
+ * Make the version of ArgoUML public.
+ */
+ static void init() {
+ ApplicationVersion.init(VERSION, STABLE_VERSION);
+ }
+
+ /**
+ * Don't allow instantiation.
+ */
+ private ArgoVersion() {
+ }
+}
Removed: trunk/src/argouml-app/src/templates/ArgoVersion.template
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/templates/ArgoVersion.template?view=markup&pathrev=18890
Modified: trunk/src/argouml-app/src/templates/manifest.template
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/templates/manifest.template?view=diff&pathrev=18891&r1=18890&r2=18891
==============================================================================
--- trunk/src/argouml-app/src/templates/manifest.template (original)
+++ trunk/src/argouml-app/src/templates/manifest.template 2010-12-06 09:40:00-0800
@@ -4,8 +4,6 @@
Name: org/argouml/application/
Specification-Title: ArgoUML
-Specification-Version: @version@
Specification-Vendor: University of California
Implementation-Vendor: University of California
-Implementation-Version: @version@
Implementation-Title: ArgoUML
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2688234
To unsubscribe from this discussion, e-mail: [[email protected]].
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.