Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removed clj-doc, clj-html, and clj-html-helpers submodules.

  • Loading branch information...
commit 70a23bd6c5c0bfcf2076818e4a171a65a6811811 1 parent 74f936d
@sumbach authored
View
1  .gitignore
@@ -3,4 +3,3 @@ Vendor/clojure/*
Vendor/clojure-contrib/*
Vendor/clojure.jar
Vendor/clojure-contrib.jar
-Vendor/clojure-documentation/*
View
9 .gitmodules
@@ -1,9 +0,0 @@
-[submodule "Vendor/clj-html-helpers"]
- path = Vendor/clj-html-helpers
- url = git://github.com/mmcgrana/clj-html-helpers.git
-[submodule "Vendor/clj-html"]
- path = Vendor/clj-html
- url = git://github.com/mmcgrana/clj-html.git
-[submodule "Vendor/clj-doc"]
- path = Vendor/clj-doc
- url = git://github.com/mmcgrana/clj-doc.git
1  Vendor/clj-doc
@@ -1 +0,0 @@
-Subproject commit 8224a9b6153eeb7f4cb22e92c0550aacfdc7e9fe
1  Vendor/clj-html
@@ -1 +0,0 @@
-Subproject commit 6d71e46a3dbe428b29552760c03ea1ef1cbb76be
1  Vendor/clj-html-helpers
@@ -1 +0,0 @@
-Subproject commit 1043b92d55ff55855a9025c4104b9b272e0ad961
View
64 Vendor/clj-update-and-build
@@ -75,7 +75,7 @@ MSG
if [[ -d "$1" ]]; then
rm -rf "$1" || exit 1
fi
- git clone git://github.com/richhickey/$1.git &&
+ git clone git://github.com/clojure/$1.git &&
cd "$1"
fi
) || (
@@ -138,60 +138,6 @@ MSG
)
}
-function update_submodule {
-(
- cd "$script_path_only" &&
- cd .. &&
- git submodule update --init &&
- cat <<-MSG
-
- =====================================================
- == CheckOut clj-doc,clj-html,clj-html-helpers
- == from github
- =====================================================
-
-MSG
-) || (
-cat <<-MSG
-
- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- !! Failed update of clj-doc,clj-html,clj-html-helpers
- !! from github
- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-MSG
-exit 1
-)
-}
-
-function update_doc {
-(
- if [[ -d clojure-documentation ]]; then
- rm -rf clojure-documentation || exit 1
- fi
- cd clj-doc && (CLASSPATH=../clojure.jar:../clojure-contrib.jar:clj-doc.jar:../clj-html/clj-html.jar:../clj-html-helpers/clj-html-helpers.jar java clojure.main bin/clojure_gen.clj ../clojure-documentation)
-)
-#TODO : Fixe return code
-if [[ -e "$script_path_only/clojure-documentation/index.html" ]]; then
-cat <<-MSG
-
- =====================================================
- == Build documentation for clojure and clojure-contrib
- =====================================================
-
-MSG
-else
-cat <<-MSG
-
- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- !! Failed documentation generation
- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-MSG
-exit 1
-fi
-}
-
function remove_sourceforge {
(
if [[ -d "clojure/.svn" ]]; then
@@ -217,9 +163,9 @@ remove_sourceforge &&
git_update clojure &&
git_update clojure-contrib &&
build-ant clojure &&
-build-mvn clojure-contrib "-Dclojure.jar=$script_path_only/clojure/clojure.jar" &&
-mv -f clojure/clojure.jar . &&
-mv -f clojure-contrib/target/clojure-contrib-*.jar clojure-contrib.jar &&
+mv -f clojure/clojure-*.jar clojure.jar &&
+build-mvn clojure-contrib "-Dclojure.jar=$script_path_only/clojure.jar" &&
+mv -f clojure-contrib/modules/complete/target/complete-*.jar clojure-contrib.jar &&
cat <<-MSG
=====================================================
@@ -227,4 +173,4 @@ cat <<-MSG
=====================================================
MSG
-) && update_submodule && update_doc
+)
2  Vendor/clojure
@@ -1 +1 @@
-Subproject commit 2855e34106b2cacd4614f2b7e31f1536b4b849bc
+Subproject commit 9b702a06dbbc88eeb7efd3c1afdcb9a437557e8b
2  Vendor/clojure-contrib
@@ -1 +1 @@
-Subproject commit af788ed71a5c92f32daa5bfc5673455bd8843faa
+Subproject commit b0f2e778a81916fbdb5cf59bdf364307ba1ec965
Please sign in to comment.
Something went wrong with that request. Please try again.