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 2017/01/04 13:32:58 UTC
[1/6] incubator-freemarker git commit: Extract META-INF folder with
files like MANIFEST.MF from freemarker.jar and put it in base directory for
eclipse
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 4b989f89b -> a33aaba43
Extract META-INF folder with files like MANIFEST.MF from freemarker.jar and put it in base directory for eclipse
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/1d59baef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/1d59baef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/1d59baef
Branch: refs/heads/2.3-gae
Commit: 1d59baef4d9d12ee61085ae096afe0219a5dbadc
Parents: 4b989f8
Author: Christoph <ch...@Christophs-MBP.fritz.box>
Authored: Tue Dec 27 20:56:33 2016 +0100
Committer: Christoph <ch...@Christophs-MBP.fritz.box>
Committed: Tue Dec 27 20:56:33 2016 +0100
----------------------------------------------------------------------
README | 2 +-
build.xml | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1d59baef/README
----------------------------------------------------------------------
diff --git a/README b/README
index 57b8d81..7c15d61 100644
--- a/README
+++ b/README
@@ -139,7 +139,7 @@ apply it to your development environment:
- Install Ant and Ivy, if you haven't yet; see earlier.
- From the command line, run `ant clean javacc ide-dependencies`. (Note that
- now the "ide-dependencies" and "build/generated-sources" was created.)
+ now the folders "ide-dependencies", "build/generated-sources" and "META-INF" were created.)
- Start Eclipse
- You may prefer to start a new workspace (File -> "Switch workspace"), but
it's optional.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1d59baef/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index b8b1b13..f72a3ea 100644
--- a/build.xml
+++ b/build.xml
@@ -1067,6 +1067,15 @@ Proceed? </input>
</fileset>
</delete>
<ivy:retrieve conf="IDE" pattern="ide-dependencies/[artifact]-[revision].[ext]" />
+
+ <!-- Extract META-INF from freemarker.jar and put it in base directory for eclipse
+ (this is needed if you want to reference freemarker-source code in the context of OSGI development with Eclipse) -->
+ <unzip src="build/freemarker.jar" dest=".">
+ <patternset>
+ <include name="META-INF/*"/>
+ </patternset>
+ </unzip>
+
</target>
<!--
[4/6] incubator-freemarker git commit: adding META-INF folder to
.gitignore
Posted by dd...@apache.org.
adding META-INF folder to .gitignore
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/312522ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/312522ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/312522ed
Branch: refs/heads/2.3-gae
Commit: 312522ed011cd1c4a688f96659714561ef465b46
Parents: 8067aad
Author: chrisrueger <ch...@gmail.com>
Authored: Tue Dec 27 21:44:43 2016 +0100
Committer: chrisrueger <ch...@gmail.com>
Committed: Tue Dec 27 21:44:43 2016 +0100
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/312522ed/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index b7d0502..a3c82cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
/build.properties
/archive/
/ide-dependencies/
+/META-INF
/out/
/bin/
[6/6] incubator-freemarker git commit: Merge commit
'refs/pull/16/head' of https://github.com/apache/incubator-freemarker into
2.3-gae
Posted by dd...@apache.org.
Merge commit 'refs/pull/16/head' of https://github.com/apache/incubator-freemarker into 2.3-gae
Summary of the merged branch: Create $project/META-INF/MANIFEST.MF as part of the ide-dependencies Ant task by extracting it from freemarker.jar. Thus other bundles in the same Eclipse workspace will recognize the Freemarker Workspace project. The somewhat unfortunate location (the project root directory) is expected by Eclipse.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a33aaba4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a33aaba4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a33aaba4
Branch: refs/heads/2.3-gae
Commit: a33aaba430f151c9074cb2968954b7f637a5d028
Parents: 4b989f8 f2adf1a
Author: ddekany <dd...@apache.org>
Authored: Wed Jan 4 14:22:25 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Jan 4 14:32:42 2017 +0100
----------------------------------------------------------------------
.gitignore | 1 +
README | 4 ++--
build.xml | 10 ++++++++++
3 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/6] incubator-freemarker git commit: correcting section about
IDE-SETUP in README: now java clean jar is required because the unpacking of
the META-INF folder requires the freemarker.jar to be present which is
removed by clean. also remove the META-INF
Posted by dd...@apache.org.
correcting section about IDE-SETUP in README: now java clean jar is required because the unpacking of the META-INF folder requires the freemarker.jar to be present which is removed by clean. also remove the META-INF folder for the ant clean target
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/8067aad2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/8067aad2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/8067aad2
Branch: refs/heads/2.3-gae
Commit: 8067aad2c1a7cf02383bb1b36f845ee706958008
Parents: 8358009
Author: chrisrueger <ch...@gmail.com>
Authored: Tue Dec 27 21:38:38 2016 +0100
Committer: chrisrueger <ch...@gmail.com>
Committed: Tue Dec 27 21:38:38 2016 +0100
----------------------------------------------------------------------
README | 2 +-
build.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8067aad2/README
----------------------------------------------------------------------
diff --git a/README b/README
index 7c15d61..6cc36c2 100644
--- a/README
+++ b/README
@@ -138,7 +138,7 @@ different version or an entierly different IDE, still read this, and try to
apply it to your development environment:
- Install Ant and Ivy, if you haven't yet; see earlier.
-- From the command line, run `ant clean javacc ide-dependencies`. (Note that
+- From the command line, run `ant clean jar javacc ide-dependencies`. (Note that
now the folders "ide-dependencies", "build/generated-sources" and "META-INF" were created.)
- Start Eclipse
- You may prefer to start a new workspace (File -> "Switch workspace"), but
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8067aad2/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2841844..a496742 100644
--- a/build.xml
+++ b/build.xml
@@ -105,6 +105,7 @@
<target name="clean" description="get rid of all generated files">
<delete dir="build" />
+ <delete dir="META-INF" />
</target>
<target name="clean-classes" description="get rid of compiled classes">
[5/6] incubator-freemarker git commit: remove javacc from
ide-dependencies as per comment
https://github.com/apache/incubator-freemarker/pull/16#issuecomment-269393716
Posted by dd...@apache.org.
remove javacc from ide-dependencies as per comment https://github.com/apache/incubator-freemarker/pull/16#issuecomment-269393716
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/f2adf1a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/f2adf1a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/f2adf1a5
Branch: refs/heads/2.3-gae
Commit: f2adf1a59c260e38d38f7653f261eca3b673e9b8
Parents: 312522e
Author: chrisrueger <ch...@gmail.com>
Authored: Wed Dec 28 00:21:57 2016 +0100
Committer: chrisrueger <ch...@gmail.com>
Committed: Wed Dec 28 00:21:57 2016 +0100
----------------------------------------------------------------------
README | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f2adf1a5/README
----------------------------------------------------------------------
diff --git a/README b/README
index 6cc36c2..2174e85 100644
--- a/README
+++ b/README
@@ -138,7 +138,7 @@ different version or an entierly different IDE, still read this, and try to
apply it to your development environment:
- Install Ant and Ivy, if you haven't yet; see earlier.
-- From the command line, run `ant clean jar javacc ide-dependencies`. (Note that
+- From the command line, run `ant clean jar ide-dependencies`. (Note that
now the folders "ide-dependencies", "build/generated-sources" and "META-INF" were created.)
- Start Eclipse
- You may prefer to start a new workspace (File -> "Switch workspace"), but
[2/6] incubator-freemarker git commit: Extract META-INF folder with
files like MANIFEST.MF from freemarker.jar and put it in base directory for
eclipse
Posted by dd...@apache.org.
Extract META-INF folder with files like MANIFEST.MF from freemarker.jar and put it in base directory for eclipse
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/83580096
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/83580096
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/83580096
Branch: refs/heads/2.3-gae
Commit: 835800962b8126eb4a250451017f595467e52d48
Parents: 1d59bae
Author: chrisrueger <ch...@gmail.com>
Authored: Tue Dec 27 20:58:26 2016 +0100
Committer: chrisrueger <ch...@gmail.com>
Committed: Tue Dec 27 20:58:26 2016 +0100
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83580096/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index f72a3ea..2841844 100644
--- a/build.xml
+++ b/build.xml
@@ -1068,7 +1068,7 @@ Proceed? </input>
</delete>
<ivy:retrieve conf="IDE" pattern="ide-dependencies/[artifact]-[revision].[ext]" />
- <!-- Extract META-INF from freemarker.jar and put it in base directory for eclipse
+ <!-- Extract META-INF folder with files like MANIFEST.MF from freemarker.jar and put it in base directory for eclipse
(this is needed if you want to reference freemarker-source code in the context of OSGI development with Eclipse) -->
<unzip src="build/freemarker.jar" dest=".">
<patternset>