From 44ab969ac0a868c4fd7368fa43a9468b609c09f4 Mon Sep 17 00:00:00 2001 From: ddekany Date: Sat, 4 Oct 2014 01:40:19 +0200 Subject: [PATCH 01/16] Docgen config: Added logo (just mock) + tabs, removed external links --- src/manual/docgen.cjson | 17 ++++++++++++----- src/manual/logo.png | Bin 0 -> 2970 bytes 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 src/manual/logo.png diff --git a/src/manual/docgen.cjson b/src/manual/docgen.cjson index 5d6023cf..0f8ab5de 100644 --- a/src/manual/docgen.cjson +++ b/src/manual/docgen.cjson @@ -13,11 +13,6 @@ internalBookmarks: { "FAQ": app_faq } -externalBookmarks: { - "API": "api/index.html" - "Home": "../index.html" -} - validation: { programlistingsRequireRole // programlistingsRequireLanguage @@ -29,4 +24,16 @@ generateEclipseTOC // link_to: "freemarker-toc.xml#ManualLink" // } +logo: { + href: "http://freemarker.org" + src: logo.png, + alt: "FreeMarker" +} + +tabs: { + "Home": "http://freemarker.org" + "Manual": "" // Empty => We are here + "Java API": "../api/index.html" +} + showXXELogo diff --git a/src/manual/logo.png b/src/manual/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0268eaf85427c552ec49fdc0576068cb77e8a8cb GIT binary patch literal 2970 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 Date: Sat, 4 Oct 2014 02:48:37 +0200 Subject: [PATCH 02/16] Changed docgen version to 2.0-branch-head in Ivy --- ivy.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivy.xml b/ivy.xml index 641e0531..3b5462f2 100644 --- a/ivy.xml +++ b/ivy.xml @@ -127,7 +127,7 @@ - + From e92ea5be04f373ce07a6a53d93b1c9419ec5e0aa Mon Sep 17 00:00:00 2001 From: ddekany Date: Sat, 4 Oct 2014 12:59:15 +0200 Subject: [PATCH 03/16] Manual: Added Google Analytics, and separate online and offline manual generating --- build.xml | 38 +++++++++++++++------ src/manual/docgen-misc/googleAnalytics.html | 9 +++++ src/manual/docgen.cjson | 2 ++ 3 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 src/manual/docgen-misc/googleAnalytics.html diff --git a/build.xml b/build.xml index df89cbf2..8a0f5053 100644 --- a/build.xml +++ b/build.xml @@ -517,16 +517,32 @@ --> - - - - - + + + + + + + + + + + + + + + + + + + + @@ -609,7 +625,7 @@ diff --git a/src/manual/docgen-misc/googleAnalytics.html b/src/manual/docgen-misc/googleAnalytics.html new file mode 100644 index 00000000..bf440f26 --- /dev/null +++ b/src/manual/docgen-misc/googleAnalytics.html @@ -0,0 +1,9 @@ + diff --git a/src/manual/docgen.cjson b/src/manual/docgen.cjson index 0f8ab5de..3939d47d 100644 --- a/src/manual/docgen.cjson +++ b/src/manual/docgen.cjson @@ -36,4 +36,6 @@ tabs: { "Java API": "../api/index.html" } +onlineTrackerHTML: "docgen-misc/googleAnalytics.html" + showXXELogo From 2707f05df1feec57f5a0313423f81b7f6adcb5d2 Mon Sep 17 00:00:00 2001 From: ddekany Date: Sun, 5 Oct 2014 22:15:47 +0200 Subject: [PATCH 04/16] Had problems with IvyDE again... just let ant generate an ide-dependencies directory for us and be done with it. --- .classpath | 19 ++++++++++++++- .gitignore | 2 ++ .../org.eclipse.ltk.core.refactoring.prefs | 2 ++ README.txt | 23 ++++++++++++------- build.xml | 10 ++++++++ 5 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 .settings/org.eclipse.ltk.core.refactoring.prefs diff --git a/.classpath b/.classpath index 94c04055..457c4267 100644 --- a/.classpath +++ b/.classpath @@ -9,7 +9,24 @@ - + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index e2e5a562..99616656 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,7 @@ /build/ /build.properties /archive/ +/ide-dependencies/ src/manual/book.xml~ + diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs new file mode 100644 index 00000000..b196c64a --- /dev/null +++ b/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/README.txt b/README.txt index 9e41b8ed..59859183 100644 --- a/README.txt +++ b/README.txt @@ -86,14 +86,21 @@ If later you change the dependencies in ivy.xml, or otherwise want to re-download some of them, it will not happen automatically anymore. You have to issue "ant update-deps" for that. -For development under Eclipse, you will need IvyDE installed. You are -advised to use the Eclipse project files included (otherwise set up -IvyDE to use the "IDE" configuration and the included -ivysettings.xml). Note that IvyDE will not find the dependencies until -"ant update-deps" has run once, because it uses the mini-repository -built by that Ant task. If you change the dependencies in ivy.xml, you -will have to run "ant update-deps" again, and only after that tell -IvyDE to resolve the dependencies. + +Eclipse and other IDE-s +----------------------- + +Run "ant ide-dependencies"; This will create an "ide-dependencies" library +that contains all the jars that you have to add to the classpath in the IDE. +Note that here we assume that you have run the build or at least +"ant update-deps" earlier. + +Known issue with workaround: An old org.jaxen is included in dom4j-*.jar, +which conflicts with jaxen-*.jar. If dom4j wins, your IDE will show some +errors in the XML related parts. To fix that, always add dom4j-*.jar last. + +You could also use IvyDE instead, with configuration "IDE", but as the +dependencies hardly ever change, it might not worth the trouble. Change log diff --git a/build.xml b/build.xml index 8a0f5053..64777c85 100644 --- a/build.xml +++ b/build.xml @@ -1044,6 +1044,16 @@ Proceed? + + + + + + + + + +