Skip to content

Commit

Permalink
update version numbers"
Browse files Browse the repository at this point in the history
  • Loading branch information
jodygarnett committed May 15, 2011
1 parent 0eaebf6 commit 65aef6a
Show file tree
Hide file tree
Showing 16 changed files with 66 additions and 59 deletions.
2 changes: 1 addition & 1 deletion deploy/sdk.sh
Expand Up @@ -37,7 +37,7 @@ then
rm ${BUILD}/sdk/udig_sdk/plugins/*swt*linux*

# TODO: figure out how to make libs and libs source have the same qualifier
mv ${BUILD}/sdk/udig_sdk/plugins/net.refractions.udig.libs.source_${QUALIFIER}/src/net.refractions.udig.libs_1.2.1.qualifier \
mv ${BUILD}/sdk/udig_sdk/plugins/net.refractions.udig.libs.source_${QUALIFIER}/src/net.refractions.udig.libs_${TAG}.qualifier \
${BUILD}/sdk/udig_sdk/plugins/net.refractions.udig.libs.source_${QUALIFIER}/src/net.refractions.udig.libs_${QUALIFIER}

cp ${BASE}/udig-1.2.x.html ${BUILD}/sdk/udig_sdk/udig-${VERSION}.html
Expand Down
5 changes: 3 additions & 2 deletions deploy/versions.sh
Expand Up @@ -5,12 +5,13 @@ export COPYFILE_DISABLE=true
export BASE=`dirname $0`

# Release Configuration
export TARGET=~/Desktop/target/1.2.1
export TARGET=~/Desktop/target/1.2.2
export VERSION=1.2-SNAPSHOT
export BUILD=${BASE}/build

# net.refractions.udig.libs "qualifier" for SDK
export QUALIFIER=1.2.1.201102022248
export TAG=1.2.2
export QUALIFIER=1.2.2.201105160026

# Build Resources
export JRE=~/Desktop/target/jre
Expand Down
2 changes: 1 addition & 1 deletion features/net.refractions.udig-feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="net.refractions.udig"
label="net.refractions.udig-feature"
version="1.2.0.qualifier"
version="1.2.2.qualifier"
provider-name="udig.refractions.net"
plugin="net.refractions.udig">

Expand Down
24 changes: 17 additions & 7 deletions features/net.refractions.udig_application-feature/feature.xml
Expand Up @@ -2,19 +2,29 @@
<feature
id="net.refractions.udig_application"
label="net.refractions.udig_application-feature"
version="1.2.0.qualifier"
version="1.2.2.qualifier"
provider-name="Refractions Research">

<description url="http://www.example.com/description">
[Enter Feature Description here.]
<description url="http://udig.refractions.net/confluence/display/DEV/6+Working+with+GIS+Application">
The uDig &quot;GIS Application&quot; represents is the tier of the uDig architecture where visualization occurs. This feature gathers up the plugins related to visualisation (including the Map, Layer, Viewport model and associated UI concepts such as the MapEditor).
</description>

<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
<copyright url="http://udig.refractions.net/">
(c) 2005-2011 Refractions Research
</copyright>

<license url="http://www.example.com/license">
[Enter License Description here.]
<license url="http://www.gnu.org/licenses/lgpl-2.1.html">
uDig - User Friendly Desktop Internet GIS client
http://udig.refractions.net
(C) 2010, Refractions Research Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public License
as published by the Free Software Foundation; version 2.1 of
the License.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
</license>

<url>
Expand Down
4 changes: 2 additions & 2 deletions features/net.refractions.udig_platform-feature/feature.xml
Expand Up @@ -2,15 +2,15 @@
<feature
id="net.refractions.udig_platform"
label="net.refractions.udig_platform-feature"
version="1.2.0.qualifier"
version="1.2.2.qualifier"
provider-name="Refractions Research">

<description url="http://udig.refractions.net/confluence/display/DEV/1+GIS+Platform">
The &quot;GIS Platform&quot; serves as the foundation of the uDig application, allowing the management of and access to spatial data.
</description>

<copyright url="http://udig.refractions.net/">
(c) 2005-2010 Refractions Research
(c) 2005-2011 Refractions Research
</copyright>

<license url="http://www.gnu.org/licenses/lgpl-2.1.html">
Expand Down
22 changes: 16 additions & 6 deletions features/net.refractions.udig_printing-feature/feature.xml
Expand Up @@ -5,16 +5,26 @@
version="1.2.0.qualifier"
provider-name="Refractions Research">

<description url="http://www.example.com/description">
[Enter Feature Description here.]
<description url="http://udig.refractions.net/confluence/display/DEV/7+Printing">
An optional printing adding a Page project element allowing the definition of a printed page.
</description>

<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
<copyright url="http://udig.refractions.net/">
(c) 2005-2011 Refractions Research
</copyright>

<license url="http://www.example.com/license">
[Enter License Description here.]
<license url="http://www.gnu.org/licenses/lgpl-2.1.html">
uDig - User Friendly Desktop Internet GIS client
http://udig.refractions.net
(C) 2010, Refractions Research Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public License
as published by the Free Software Foundation; version 2.1 of
the License.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
</license>

<url>
Expand Down
2 changes: 1 addition & 1 deletion features/net.refractions.udig_sdk-feature/udig-sdk.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="uDig SDK" uid="udig-sdk" id="net.refractions.udig.sdk" application="net.refractions.udig.ui.application" version="1.2.1.qualifier" useFeatures="true" includeLaunchers="false">
<product name="uDig SDK" uid="udig-sdk" id="net.refractions.udig.sdk" application="net.refractions.udig.ui.application" version="1.2.2.qualifier" useFeatures="true" includeLaunchers="false">

<configIni use="default" path="/net.refractions.udig-feature/config.files/configuration/config.ini">
</configIni>
Expand Down
2 changes: 1 addition & 1 deletion plugins/eu.udig.style.advanced/META-INF/MANIFEST.MF
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Style Plugin
Bundle-SymbolicName: eu.udig.style.advanced;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 1.0.2.qualifier
Bundle-Activator: eu.udig.style.advanced.StylePlugin
Bundle-Vendor: HydroloGIS S.r.l.
Require-Bundle: org.eclipse.ui,
Expand Down
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Source Plug-in
Bundle-SymbolicName: net.refractions.udig.libs.source;singleton:=true
Bundle-Version: 1.2.1.qualifier
Bundle-Version: 1.2.2.qualifier
Bundle-Vendor: udig.refractions.net
2 changes: 1 addition & 1 deletion plugins/net.refractions.udig.libs.source/dest.properties
@@ -1 +1 @@
libs_src_dir=${basedir}/src/net.refractions.udig.libs_1.2.1.qualifier/lib
libs_src_dir=${basedir}/src/net.refractions.udig.libs_1.2.2.qualifier/lib
15 changes: 2 additions & 13 deletions plugins/net.refractions.udig.libs.source/refresh.xml
Expand Up @@ -17,16 +17,15 @@
</java>
<loadproperties srcfile="${basedir}/dest.properties" />
<echo>copy into: ${libs_src_dir}</echo>
<echo>should be: ${basedir}/src/net.refractions.udig.libs_1.2.1.qualifier/lib </echo>
<echo>should be: ${basedir}/src/net.refractions.udig.libs_1.2.2.qualifier/lib </echo>
<!-- formally ${libs_src_dir} -->
<copy todir="${basedir}/src/net.refractions.udig.libs_1.2.1.qualifier/lib" verbose="true">
<copy todir="${basedir}/src/net.refractions.udig.libs_1.2.2.qualifier/lib" verbose="true">
<fileset refid="sources.dependency.fileset" />
<chainedmapper>
<mapper type="flatten" />
<mapper type="glob" from="*-sources.jar" to="*src.zip" />
</chainedmapper>
</copy>
<!--antcall target="fix" /-->
</target>

<!-- =================================
Expand All @@ -38,16 +37,6 @@
<delete dir="${basedir}/src" />
</target>

<target name="fix">
<move file="${libs_src_dir}/geoapi-2.3-SNAPSHOTsrc.zip" tofile="${libs_src_dir}/geoapi-2.2-PREVIOUSsrc.zip" verbose="true" failonerror="no" />
<move todir="${libs_src_dir}" verbose="true" failonerror="no">
<fileset dir="${libs_src_dir}">
<include name="geoapi-2.3-*.zip" />
</fileset>
<mapper type="regexp" from="^.*$" to="geoapi-2\.3-SNAPSHOTsrc\.zip" />
</move>
</target>

<!-- Used by headless build please make sure this does everthing from clean to download and fix etc.. -->
<target name="full-build" depends="clean, download.src" description="clean and build">
</target>
Expand Down
2 changes: 1 addition & 1 deletion plugins/net.refractions.udig.libs/META-INF/MANIFEST.MF
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: net.refractions.udig.libs;singleton:=true
Bundle-Version: 1.2.1.qualifier
Bundle-Version: 1.2.2.qualifier
Bundle-Vendor: udig.refractions.net
Bundle-Localization: plugin
Eclipse-BuddyPolicy: registered,
Expand Down
2 changes: 1 addition & 1 deletion plugins/net.refractions.udig.ui/META-INF/MANIFEST.MF
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: net.refractions.udig.ui; singleton:=true
Bundle-Version: 1.2.0.qualifier
Bundle-Version: 1.2.2.qualifier
Bundle-Activator: net.refractions.udig.internal.ui.UiPlugin
Bundle-Vendor: udig.refractions.net
Bundle-Localization: plugin
Expand Down
2 changes: 1 addition & 1 deletion plugins/net.refractions.udig/META-INF/MANIFEST.MF
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: net.refractions.udig; singleton:=true
Bundle-Version: 1.2.1.qualifier
Bundle-Version: 1.2.2.qualifier
Bundle-Vendor: udig.refractions.net
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
Expand Down
4 changes: 2 additions & 2 deletions plugins/net.refractions.udig/about.mappings
Expand Up @@ -7,5 +7,5 @@
# 0=@date@
# 1=@version@-@timestamp@

0=2011-05-07
1=1.2.2
0=2011-05-15
1=1.2-SNAPSHOT
33 changes: 15 additions & 18 deletions plugins/net.refractions.udig/udig.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="%product.name" uid="udig" id="net.refractions.udig.product" application="net.refractions.udig.ui.application" version="1.2.1.qualifier" useFeatures="true" includeLaunchers="true">
<product name="%product.name" uid="udig" id="net.refractions.udig.product" application="net.refractions.udig.ui.application" version="1.2.2.qualifier" useFeatures="true" includeLaunchers="true">

<aboutInfo>
<image path="/net.refractions.udig/icons/about.gif"/>
Expand Down Expand Up @@ -43,23 +43,20 @@
<license>
<url>http://www.gnu.org/licenses/lgpl.html</url>
<text>
/*
* uDig - User-friendly Desktop Internet GIS
* http://udig.refractions.net
* (C) 2004-2010 Refractions Research Inc.
* http://www.refractions.net
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
*/
uDig - User-friendly Desktop Internet GIS
http://udig.refractions.net
(C) 2004-2011 Refractions Research Inc.
http://www.refractions.net

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation;
version 2.1 of the License.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
</text>
</license>

Expand Down

0 comments on commit 65aef6a

Please sign in to comment.