You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2016/01/03 00:22:39 UTC
[1/2] incubator-freemarker git commit: Build: Removed abandoned
Eclipse update site generator
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 31690f68d -> 547c1eb36
Build: Removed abandoned Eclipse update site generator
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/813dce1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/813dce1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/813dce1f
Branch: refs/heads/2.3-gae
Commit: 813dce1f0557e83b1f3fc39a101e6decf0148be8
Parents: 31690f6
Author: ddekany <dd...@apache.org>
Authored: Sun Jan 3 00:20:17 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Jan 3 00:20:17 2016 +0100
----------------------------------------------------------------------
build.xml | 133 ---------------------------------------------------------
1 file changed, 133 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/813dce1f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c957988..0b15d2d 100644
--- a/build.xml
+++ b/build.xml
@@ -931,139 +931,6 @@ Proceed? </input>
<!-- ================================================================== -->
- <!-- Eclipse -->
- <!-- ================================================================== -->
-
- <property name="eclipseFeatureFileName" value="org.freemarker.freemarker.feature_${versionForOSGi}.jar" />
- <property name="eclipseSourceFeatureFileName" value="org.freemarker.freemarker.source.feature_${versionForOSGi}.jar" />
- <property name="eclipsePluginFileName" value="org.freemarker.freemarker_${versionForOSGi}.jar" />
- <property name="eclipseSourcePluginFileName" value="org.freemarker.freemarker.source_${versionForOSGi}.jar" />
-
- <target name="eclipse-update-site" depends="jar">
- <delete dir="build/eclipse" />
-
- <!-- Create org.freemarker.freemarker feature: -->
-
- <mkdir dir="build/eclipse/freemarker/plugins" />
- <copy
- file="build/freemarker.jar"
- tofile="build/eclipse/freemarker/plugins/org.freemarker.freemarker_${versionForOSGi}.jar"
- />
-
- <mkdir dir="build/eclipse/freemarker/features/tmp" />
- <echo file="build/eclipse/freemarker/features/tmp/feature.xml"><![CDATA[<?xml version="1.0"?>
-<feature
- id="org.freemarker.freemarker"
- label="FreeMarker"
- version="${versionForOSGi}">
-
- <description url="http://freemarker.org">
- Adds barebone FreeMarker as a plug-in (OSGi bundle) to Eclipse.
- </description>
-
- <license><!--
- -->Apache License, Version 2.0; see http://freemarker.org/LICENSE.txt.<!--
- --></license>
-
- <plugin
- id="org.freemarker.freemarker"
- download-size="0"
- install-size="0"
- version="${versionForOSGi}"
- unpack="false"
- />
-</feature>
- ]]></echo>
- <jar
- basedir="build/eclipse/freemarker/features/tmp"
- destfile="build/eclipse/freemarker/features/${eclipseFeatureFileName}"
- />
- <delete dir="build/eclipse/freemarker/features/tmp" />
-
- <!-- Create org.freemarker.freemarker.source feature: -->
-
- <mkdir dir="build/eclipse/freemarker/plugins" />
- <jar
- basedir="src/main/java" jarfile="build/eclipse/freemarker/plugins/org.freemarker.freemarker.source_${versionForOSGi}.jar"
- >
- <manifest>
- <attribute name="Bundle-SymbolicName" value="${moduleOrg}.${moduleName}.source" />
- <attribute name="Bundle-Version" value="${versionForOSGi}" />
- <attribute name="Bundle-License" value="Apache License, Version 2.0" />
- <attribute name="Bundle-Vendor" value="freemarker.org" />
- <attribute name="Eclipse-SourceBundle" value='org.freemarker.freemarker;version="${versionForOSGi}";roots:="."' />
- </manifest>
- </jar>
-
- <mkdir dir="build/eclipse/freemarker/features/tmp" />
- <echo file="build/eclipse/freemarker/features/tmp/feature.xml"><![CDATA[<?xml version="1.0"?>
-<feature
- id="org.freemarker.freemarker.source"
- label="FreeMarker source"
- version="${versionForOSGi}">
-
- <description url="http://freemarker.org">
- Adds source code attachment to the barebone FreeMarker plug-in.
- </description>
-
- <license><!--
- -->Apache License, Version 2.0; see http://freemarker.org/LICENSE.txt.<!--
- --></license>
-
- <plugin
- id="org.freemarker.freemarker.source"
- download-size="0"
- install-size="0"
- version="${versionForOSGi}"
- unpack="false"
- />
-</feature>
- ]]></echo>
- <jar
- basedir="build/eclipse/freemarker/features/tmp"
- destfile="build/eclipse/freemarker/features/${eclipseSourceFeatureFileName}"
- />
- <delete dir="build/eclipse/freemarker/features/tmp" />
-
- <!-- Create site: -->
-
- <echo file="build/eclipse/freemarker/site.xml"><![CDATA[<?xml version="1.0"?>
-<site>
- <feature url="features/${eclipseFeatureFileName}"
- id="org.freemarker.freemarker"
- version="${versionForOSGi}">
- <category name="core" />
- <category name="core-with-sources" />
- </feature>
- <feature url="features/${eclipseSourceFeatureFileName}"
- id="org.freemarker.freemarker.source"
- version="${versionForOSGi}">
- <category name="core-with-sources" />
- </feature>
- <category-def name="core" label="FreeMarker core">
- <description>
- Features that are used as dependencies of other products, but do nothing visible themselves.
- </description>
- </category-def>
- <category-def name="core-with-sources" label="FreeMarker core with sources">
- <description>
- Features that are used as dependencies of other products, but do nothing visible themselves.
- Includes source code attachments.
- </description>
- </category-def>
-</site>
- ]]></echo>
- <echo message="**************************************************************" />
- <echo message="The new Eclipse update site is created in:" />
- <echo message="${basedir}/build/eclipse/freemarker" />
- <echo message="You can use this directory as a local update site in Eclipse," />
- <echo message="or if you are an admin who makes a release, you should replace" />
- <echo message="http://freemarker.org/eclipse/freemarker with this directory." />
- <echo message="**************************************************************" />
- </target>
-
-
- <!-- ================================================================== -->
<!-- Dependency management (keep it exactly identical for all projects) -->
<!-- ================================================================== -->
[2/2] incubator-freemarker git commit: Build: Fixed missing
META-INF/LICENSE
Posted by dd...@apache.org.
Build: Fixed missing META-INF/LICENSE
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/547c1eb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/547c1eb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/547c1eb3
Branch: refs/heads/2.3-gae
Commit: 547c1eb36f4495b5700c322a4bdae764ef1f6daa
Parents: 813dce1
Author: ddekany <dd...@apache.org>
Authored: Sun Jan 3 00:22:24 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Jan 3 00:22:24 2016 +0100
----------------------------------------------------------------------
build.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/547c1eb3/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 0b15d2d..9a43a45 100644
--- a/build.xml
+++ b/build.xml
@@ -338,9 +338,7 @@
</copy>
<copy toDir="build/classes/META-INF">
<fileset dir="."
- includes="
- LICENSE.txt,
- NOTICE.txt"
+ includes="LICENSE"
/>
</copy>
</target>