Menu
▾
▴
[Sbcl-commits] (webpage) master: switch to git workflow
|
From: Nikodemus S. <de...@us...> - 2011-06-06 09:23:41
|
The branch "master" has been updated in SBCL webpage:
from 62cdf2fb6043d22119eb61c05664ff5f0bdf58c8 (commit)
- Log -----------------------------------------------------------------
commit 50a7667cfd96adbd3384922314ecb4fac1b8dfc8
Author: Nikodemus Siivola <nik...@sb...>
Date: Mon Jun 6 12:11:20 2011 +0300
switch to git workflow
Add sbcl.git as a submodule.
Adjust makefile and date-extraction to work with Git.
Add a pointer to the git repository to the webpage.
---
.gitmodules | 3 +++
index-page.lisp | 2 +-
makefile | 34 ++++++++++++++++++----------------
platform-support.lisp | 17 ++++++++++-------
sbcl | 1 +
sbcl.css | 2 +-
6 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a3d7269
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "sbcl"]
+ path = sbcl
+ url = git://sbcl.git.sourceforge.net/gitroot/sbcl/sbcl.git
diff --git a/index-page.lisp b/index-page.lisp
index fa2c392..c3daf34 100644
--- a/index-page.lisp
+++ b/index-page.lisp
@@ -20,7 +20,7 @@
:direction :input)
(list
(read-line stream)
- (let ((date (split-at #\/ (read-line stream))))
+ (let ((date (split-at #\- (read-line stream))))
(if (eql (length date) 3)
(let ((month (parse-integer (second date))))
(format nil "~A ~A, ~A" (elt *month-names* (1- month))
diff --git a/makefile b/makefile
index c24c033..de5b07f 100644
--- a/makefile
+++ b/makefile
@@ -13,34 +13,36 @@ HTDOCSDIR=/home/groups/s/sb/sbcl/htdocs
UPLOADFILES=$(wildcard *.html *.css *.png)
-ifeq ($(CURRENT_RELEASE),)
-$(error Set CURRENT_RELEASE before running make)
-else
-RELEASE_TAG=sbcl_$(subst .,_,$(CURRENT_RELEASE))
-endif
-
-.PHONY: all generate-pages clean clean-generated clean-junk commit upload
+.PHONY: all generate-pages clean clean-generated clean-junk commit upload sbcl
all: generate-pages
-NEWS::
- cvs co -p -r $(RELEASE_TAG) sbcl/NEWS > NEWS
+sbcl:
+ git submodule update --init
+
+current-release: sbcl
+ cd sbcl && git describe --match 'sbcl*' --abbrev=0 | sed -e s/sbcl.// | sed -e s/_/\./g > ../current-release
+ cd sbcl && git log -1 --pretty=format:%ad --date=short >> ../current-release
-current-release:: NEWS
- ( echo $(CURRENT_RELEASE) > current-release ; \
- cvs rlog -N -r$(RELEASE_TAG) sbcl/version.lisp-expr | ./cvs-rlog-to-date >> current-release )
+NEWS: sbcl
+ cp sbcl/NEWS NEWS
generate-pages: current-release
SBCL=$(SBCL); $${SBCL:-sbcl} --eval "(require :asdf)" --eval "(require :sbcl-page)" --eval "(sbcl-page:generate-pages)" --eval "(quit)"
+sbcl/doc/manual/sbcl.html:
+ cd sbcl && sh make.sh
+ cd sbcl/doc/manual && make
+
+manual: sbcl/doc/manual/sbcl.html
+ mkdir -p manual
+ cp sbcl/doc/manual/sbcl.html manual/index.html
+
clean: clean-generated clean-junk
clean-generated:
rm -f *.html
-commit:
- cvs commit
-
# Circa October 2008, SF no longer gives us shell access, so we can't
# do interesting backupoid operations like this target anymore.
#
@@ -61,7 +63,7 @@ commit:
# rsync -avP -e ssh -b *.html <user>,sb...@we...:/home/groups/s/sb/sbcl/htdocs/
upload: generate-pages
- rsync -avP -e ssh -b $(UPLOADFILES) $(SFNETUSER),sbcl@$(SFNETHOST):$(HTDOCSDIR)
+ rsync -avP -e ssh -b manual $(UPLOADFILES) $(SFNETUSER),sbcl@$(SFNETHOST):$(HTDOCSDIR)
clean-junk:
rm -f *.fasl *~ *.lisp-expr
diff --git a/platform-support.lisp b/platform-support.lisp
index 6e48632..10bb435 100644
--- a/platform-support.lisp
+++ b/platform-support.lisp
@@ -110,8 +110,6 @@
(defun port-page ()
(list
(<p>
- "SBCL runs on many Unix and Unix-like systems. The following table summarizes what systems SBCL runs on, and what it could run on but currently does not. The table also contains links to the latest binaries for SBCL on each platform, when they are available.")
- (<p>
"The most recent version of SBCL is "
(first *most-recent-release*)
", released "
@@ -121,6 +119,16 @@
"news page")
".")
(<p>
+ (<b> "Source: ")
+ (<a href= ,(format nil "http://prdownloads.sourceforge.net/sbcl/sbcl-~A-source.tar.bz2?download" (car *most-recent-release*))>
+ ;; FIXME: remove the -r2 for 1.0.30, or use somethign more automagic...
+ "sbcl-" (car *most-recent-release*) "-source.tar.bz2"))
+ (<p> "The development version is available from git: ")
+ (<pre> "git clone git://sbcl.git.sourceforge.net/gitroot/sbcl/sbcl.git")
+ (<p> (<b> "Binaries: "))
+ (<p> "The table below links to the latest binaries for SBCL on
+ each platform, where are available.")
+ (<p>
"After downloading SBCL, refer to the "
(<a href=,(page-link :getting-sbcl)>
"getting started")
@@ -132,11 +140,6 @@
" and follow the directions for "
(<a href= ,(page-link :getting-sbcl)>
"compiling it") ".")
- (<p>
- (<b> "Source code: ")
- (<a href= ,(format nil "http://prdownloads.sourceforge.net/sbcl/sbcl-~A-source.tar.bz2?download" (car *most-recent-release*))>
- ;; FIXME: remove the -r2 for 1.0.30, or use somethign more automagic...
- "sbcl-" (car *most-recent-release*) "-source.tar.bz2"))
(<div class= "left-floater">
(port-xml))
(<table class= "key">
diff --git a/sbcl b/sbcl
new file mode 160000
index 0000000..34ac026
--- /dev/null
+++ b/sbcl
@@ -0,0 +1 @@
+Subproject commit 34ac026c949bdb6f782065681361267e383e59a7
diff --git a/sbcl.css b/sbcl.css
index 7b3e21d..aadb5e4 100644
--- a/sbcl.css
+++ b/sbcl.css
@@ -19,7 +19,7 @@ div.body-contents { padding: 5pt; margin-left: 10%; margin-right: 10%; }
.body-contents h1 { font-size: large; font-weight: bold; text-align: left; padding: 1em 0em 1em 0em; margin: 0pt; }
.body-contents h2 { font-size: medium; font-weight: bold; text-align: left; padding: 1em 0em 1em 0em; margin: 0pt; }
-.body-contents pre { margin-left: 1em; margin-right: 1em; padding: 3pt; background-color: #F4F4F4; border: 1.5pt solid #DDD; clear: right; overflow: auto; }
+.body-contents pre { margin-left: 1em; margin-right: 1em; padding: 3pt; background-color: #F4F4F4; border: 1.5pt solid #DDD; overflow: auto; }
.body-contents code { background-color: #F4F4F4; }
-----------------------------------------------------------------------
hooks/post-receive
--
SBCL webpage
|