From a0be0664e284a77011924c807dd7f35774f796d9 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Mon, 31 Mar 2008 12:59:00 +0200 Subject: [PATCH] Preparing a new release setup. This required changing the Makefile. I also added a new program set-version.pl that can be used to synchronize the version number in all core files of the distribution, along with the web files. --- ChangeLog | 1 + Makefile | 39 ++++++++++---------- ORGWEBPAGE/img/nrocinu.jpg | Bin 0 -> 3720 bytes ORGWEBPAGE/index.org | 4 +-- ORGWEBPAGE/org.css | 87 +++++++++++++++++++++++++++++++++++++++++++++ README | 72 ++++++++++++++++++++++++++----------- README_DIST | 45 +++++++++++++++++++++++ UTILITIES/set-version.pl | 10 +++++- lisp/org.el | 2 +- 9 files changed, 215 insertions(+), 45 deletions(-) create mode 100644 ORGWEBPAGE/img/nrocinu.jpg create mode 100644 ORGWEBPAGE/org.css rewrite README (97%) create mode 100644 README_DIST diff --git a/ChangeLog b/ChangeLog index df0569190..a1197f62c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ + 2008-03-30 Carsten Dominik * lisp/org.el (org-columns-hscoll-title): New function. diff --git a/Makefile b/Makefile index b0ee91997..4de98d686 100644 --- a/Makefile +++ b/Makefile @@ -70,23 +70,23 @@ LISPFILES0 = $(LISPF:%=lisp/%) LISPFILES = $(LISPFILES0) lisp/org-install.el ELCFILES0 = $(LISPFILES0:.el=.elc) ELCFILES = $(LISPFILES:.el=.elc) -DOCFILES = org.texi org.pdf org +DOCFILES = doc/org.texi doc/org.pdf doc/org doc/dir CARDFILES = doc/orgcard.tex doc/orgcard.pdf doc/orgcard_letter.pdf TEXIFILES = doc/org.texi INFOFILES = doc/org -HG_RELEASES = ../org-mode-all-releases-hg/ .SUFFIXES: .el .elc .texi SHELL = /bin/sh -DISTFILES= README ${LISPFILES} ${DOCFILES} ${CARDFILES} \ - Makefile dir ChangeLog request-assign-future.txt \ - CONTRIB +# Additional distribution files +DISTFILES_extra= Makefile ChangeLog request-assign-future.txt CONTRIB DISTFILES_xemacs= xemacs/noutline.el xemacs/ps-print-invisible.el xemacs/README default: $(ELCFILES) + all: $(ELCFILES) $(INFOFILES) + compile: $(ELCFILES0) install: install-lisp @@ -156,11 +156,12 @@ doc/orgcard_letter.ps: doc/orgcard_letter.dvi # Below here are special targets for maintenance only webfiles: - (cd ORGWEBPAGE; emacs -batch -l ~/.emacs index.org -f org-publish-current-project) + (cd ORGWEBPAGE; emacs -batch -l ~/.emacs index.org -eval '(org-publish (assoc "orgwebpage" org-publish-project-alist))') + (cd ORGWEBPAGE/tmp; rm *~) web: make webfiles - (cd ORGWEBPAGE/tmp; lftp -f ../../../org-mode-proprietary/ftp_upload_website) + (cd ORGWEBPAGE/tmp; lftp -f ../../../org-mode-proprietary/ftp_upload_website_legito) html: doc/org.html @@ -177,14 +178,20 @@ card: doc/orgcard.pdf doc/orgcard.ps doc/orgcard_letter.pdf doc/orgcard_letter.p distfile: @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi - touch org.texi orgcard.tex + touch doc/org.texi doc/orgcard.tex # force update make info make doc - make org-install.el + make lisp/org-install.el rm -rf org-$(TAG) org-$(TAG).zip $(MKDIR) org-$(TAG) $(MKDIR) org-$(TAG)/xemacs - cp -r $(DISTFILES) org-$(TAG)/ + $(MKDIR) org-$(TAG)/doc + $(MKDIR) org-$(TAG)/lisp + cp -r $(LISPFILES) org-$(TAG)/lisp + cp -r $(DOCFILES) $(CARDFILES) org-$(TAG)/doc + cp -r $(DISTFILES_extra) org-$(TAG)/ + cp -r README_DIST org-$(TAG)/README + cp -r ORGWEBPAGE/Changes.org org-$(TAG)/ cp -r $(DISTFILES_xemacs) org-$(TAG)/xemacs/ zip -r org-$(TAG).zip org-$(TAG) gtar zcvf org-$(TAG).tar.gz org-$(TAG) @@ -206,20 +213,12 @@ release: # cp ORGWEBPAGE/tmp/*.jpg RELEASEDIR cp RELEASEDIR/org-$(TAG).zip RELEASEDIR/org.zip cp RELEASEDIR/org-$(TAG).tar.gz RELEASEDIR/org.tar.gz - (cd $(HG_RELEASES); rm -rf $(DISTFILES) xemacs) - cp -r org-$(TAG)/* $(HG_RELEASES) - (cd $(HG_RELEASES); hg addremove; hg ci -m $(TAG); hg tag $(TAG)) - -trackrelease: - (cd $(HG_RELEASES); rm -rf $(DISTFILES) xemacs) - cp -r org-$(TAG)/* $(HG_RELEASES) - (cd $(HG_RELEASES); hg addremove; hg ci -m $(TAG); hg tag $(TAG)) upload_release: - (cd RELEASEDIR; lftp -f ../../org-mode-proprietary/ftp_upload_release) + (cd RELEASEDIR; lftp -f ../../org-mode-proprietary/ftp_upload_release_legito) upload_manual: - lftp -f ../org-mode-proprietary/ftp_upload_manual + lftp -f ../org-mode-proprietary/ftp_upload_manual_legito relup: make release diff --git a/ORGWEBPAGE/img/nrocinu.jpg b/ORGWEBPAGE/img/nrocinu.jpg new file mode 100644 index 0000000000000000000000000000000000000000..275e3d4fe365332f2fb791155062011e1d0be986 GIT binary patch literal 3720 zcwUuPcQo8h+y1S!TC~;6TB1Z3L?XIG1S=t;MNPCsiMDzKL5RB8u+gKh=tNl(8#Sv0 z5uL>%YLrBX&gXgF@BO~#kN2PVnsesNocr9@ea+l+=AJnlKO+H*h}$~10T2iTXrDLW z>=a_yIB~2n+?CbpS8`1dx$|LBRh5L5Ex8$uKgU;e;WZZFgXNDagmZq<_5EYCkww#XcCox?9E(Ow)@C1cEKwe zwuW}zc{Qzrb3e}+xIuq;fd0u(4gryYDJaj45>S8)1SUJ*9y0L1gP+qwFUmlem~R;H z%i0KdCRJ0g+z-t?n*?ajRgyu$P(TeJ*4|QwLV;ViKu|_<6{to(7Xr+iz@9+zkNXu6 z(0FAFxy(tx1eWFJRn#tOtnH5#XRl)nzY@spcK|jt|%AB?CEMgGQjIb9)}P1HCph6IUiu3-ivOP0Nm!)`LZG@J1TbHn@;*9Tv&4-ogBTv zQY%Z{yxxS-)A&NL%ccBL&0`{z*B#ZZfZS8YPON@a4eY#A7cAM9pR)Z~HozRV6+r0g z7hLEKUL(0{B2F@6n=4iz;sMV^4wj{67541Fy}y{ZP46j*{7H~Ynr!Nr5Xl#9LL-G( znDSHk6!;H}CSwSOe&|7czg!GnjiA?^Zms<1p#fIJM(&Rgl(Fky3Av@tSgf**!;vJw zi)+0b@QfdC=9JG+6D=tN0w3>7>`?Y6a#7E%9-44bfDYElll!Ur8Jgb+7p(f=>|8`8OKFXqmsz* z3Q=Dwf2d7qW@f@LLGq)uS7``k!%+HCgD&w=HcG^~gD#oMTGuR1<_+AsVw~;}XpW%d zmAadPpT#=yvIQ+bG}1|`=VEt^K4g!c3In0*9$kU@eL97DSwh`eh@O;9XVtt|!jy)? z3T`_8(hGdZq)`p%lzX)?p{q8rYJgzH-|}2hsRP?UyxMr!=;Ggc|AY5D(l5nV%2kK( zY;{h?>4%aiOy}sZff}a5G5vlGQC>OOZuF2Rqwr6?Z+PP8?zyTEU1|0<&6*f3&auqB zCyD_M*kV*3^+Vdhk1A;Cxi21@47T+{FDD}_4IQ1i3%xZ{w9-Yb;;3QmD9@iNLC88L znvB4T;nBknaV*x#@peUt?6Qm@SE})BYfcufSM&8OHjz_CTZ?m@ZO zqc;wm4tT-{50p$wGwSbyLY6PG8C&U5T9jLWsj2WMVIv~8bp)zLYkdUEQ{X-#8O zSc|3%JaI;{*_iYzf;HDkatx;{b%D{DmU!nk`ZwIXHZXpfR1>vB@+WRQpi^jrUCOJt zW9{NmKVI7$@5J%dtUZIQc#T&F32^JX8)GFEBSMQmGQLL=O6M}AoNt7?}_{=r9V^zg2sw))FrJ^!ZfQkxb z!+QL6qrGwf{4^^=oZ`KEUd3}hO;t$3>39b6BwETpeR#PeSfkJE*mi`V?O2k&Z>iGc zwZ8M{Pg2Vff%NqPURS>$@O#oX#Ga}auCd>Lm>oY-%ZS(k$h|77W4q3~#X$5F9TqtzqfCE6G- zK2ugGGsN(WhMIyFub1fS{`y(=DdNc96(z&X#WflSPyiQFIqpc&)mz*z?+Ux4t)wO(=iqjYmarBt;^ZSC$;%xOv5L}0Mu2p3*_)^cmR&>l?U z=GHpt`E@ZMjRZp2JBFM*#60jsMt_B*0gHvfgqg!=LJ$#%6MT$vcJ2Mub5SO z!E#IjoVVM!bJ3GVd58U)ytQd7QwNxQaQRJzGRBvei|#Nfe62B&N&pP8&4=V}sGwMf zMZ8@E>(OJI37q$jj(pwj?+rO&XBqB1nM(sM@iACi^2QK@VWXN>IqSwUN@*22QP0?F z zO_Y*a-L_0t0AVfNBEEWB+^d_-F06#3>=3_lEkm4L)g&(!=MNhYPG*{*V; zvxkVHv9zYxcr)Sedzq?v?_8-ba~v~8v9PwJ>X_YvtkcK0EEkJ2l=N}G1$PP99UdFS z`cPgjZdQHHdVJG3nSJ+r@}AC~*0rNMcA$dLsghonG+!Q0JJe~Z0DLU2_6%4>TE|3u zx&*s4dHhzj8Nb$eyN;F9&qcp~PFFXbw1lhcyV%D^3R7f!KFptPi1`z};QDzMEV3&k zP+=fVQD4Nwt*SOmKQM*wG;ewmZLWF}wd(e3s9%5oY6$Z8YG3sM>$@m*0dg`n6g4{6 z@A}HFd~|}#By5aQE-sAzhGn|RTgMaE;+?X-YahZ--eyP@roL(0THRQauAJfVH0dr; z5Gm<(ePh@VDt^+ff7AfSzoH!R@^H*Ttg*^XV8o>O7LgZjYX7S;i$pOfbV$nRmU@>v zU`lCa8`7z@2O>nKD-U?TrWC!2^>NMnVfYl+vLd!xAk)jauJtBWfE-RL-|(0)A_mOW zrk9|VMlhFx#|v#-7FIV55_;dx^SocuLRaGJec0vvGznCnOwJc|`0)5@xJY9!EJ=I6 z&~70KB^d}KDpYVYYT2^Lpn?N#_$sHsY^U1HvzrX#Oy#l}ZGfW|(ymokc(?`(JaJ(4 z)5>36O1ev0UxO%7+xaE2Z3|sjWr?<&Qc;_YOpqivjAEtqy?qENrv|~MUc%uVe36(W zB5N|AW)R11_(*uWaivLxBHA4Ur6JBk*$@xJ#AfHdwO-Zuje3xOSuL+M`K=w-Wt^OE zxl9^G+DBw4Iw)zHO>NrBATxN=`pOvq5k6%WnL_JY!hc6(nwMAO#ZB@s=Dm*t%kYgn0K z)EB+Ffy)2T@lBiYQ+sm4ci)avTfOk~iMXeaZ_H3rk%ZMob+5D==e+^s<7dk5+X^&q zKmCMn(Qf*nwsed^(`6+T@(GdVRH`_dTNl}y1Go0YDuhgA53PxE7_XP3rR#>RtglaE zTu>gf^kZT2es$|=i#xFS$zkmAzhpfVBtR<7@F4fiBJze>B z1xd>(<&M3X&tLE$-pgSjbyr8PJG-G<9kIbMGrr5242#_0wP3{hU=!tCryBzCsJ(xIG9{z`Kn9fXHg zm5x=AWiX+e)+T&~-CorE+RXRyHkk?NOF~KVgKN?Q`n2ocvpE*sUr)l+jF)!lUwmV4 zQNefW&eNlB&QhNNCU$C9*J9!%id;mnO{(y?>Q8!RX^!mFKb&#`SU&rr{1-Mj1%83X lH|l#g{ceFC^*ng+&qp(j4HU#-`0{^e|M$JQr58F literal 0 HcwPel00001 diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org index bb3d272a0..ae89f6d36 100644 --- a/ORGWEBPAGE/index.org +++ b/ORGWEBPAGE/index.org @@ -22,9 +22,9 @@ messages, BBDB entries, and any files related to the projects. For printing and sharing of notes, an Org-mode file can be exported as a structured ASCII file, HTML, and LaTeX. -* Current Version (5.23a) and Compatibility +* Current Version (6.00pre-1) and Compatibility -The current version is 5.23a. To see what has changed in recent +The current version is 6.00pre-1. To see what has changed in recent releases, check this [[file:Changes.html][list of user-visible changes]]. These descriptions are extensive, to avoid that people will be printing the manual after each incremental release. If you have an older version of the manual, diff --git a/ORGWEBPAGE/org.css b/ORGWEBPAGE/org.css new file mode 100644 index 000000000..b7a3c03e7 --- /dev/null +++ b/ORGWEBPAGE/org.css @@ -0,0 +1,87 @@ +body { + margin: 10px 6% 10px 250px; + font-family: Verdana; + font-size: 11pt; + text-align: left; + background-image: url(img/nrocinu.jpg); + background-attachment: fixed; + background-repeat: no-repeat; + background-position: left top; +} + +h1 {font-size: 14pt;} + +#table-of-contents { + font-size: 85%; + position: fixed; + display: bloc; + left: 10px; + top: 180px; + width: 200px; + line-height: 14pt; +} + +#table-of-contents h2 { + display:none; +} + +#table-of-contents ul { + list-style: none; + margin: 7px 0px 7px 15px ; + padding: 0px; +} + +.title { + padding-bottom: 7px; + margin-bottom: 20px; + border-bottom: 1px solid #222; +} + +h2 { + font-size: 12pt; + padding-bottom: 4px; + margin-top: 5px; + margin-bottom: 5px; + border-bottom: 1px solid #DDD; +} + +h3 {font-size: 11pt; color: #a34d32;} +h4 {font-size: 9pt;} + +a {text-decoration: none; color: #537d7b} +a:visited {text-decoration: none; color: #224444} +a:hover {text-decoration: underline; color: #a34d32} + +.todo {color: #990000;} +.done {color: #006666;} +.timestamp-kwd {color: #444;} +.tag {color: #DDD; font-size: 70%; font-weight: 500;} + +table {border: none;} +td {border: none; padding: .1em .7em .1em .3em;} +th {border: none;} + +code {font-size: 10pt;} + +pre { + border: 1px solid #555; + background: #EEEEEE; + font-size: 9pt; + padding: 1em; +} + +img { + border: none; +} + +.share img { + opacity: .4; + -moz-opacity: .4; + filter: alpha(opacity=40); +} + +.share img:hover { + opacity: 1; + -moz-opacity: 1; + filter: alpha(opacity=100); +} diff --git a/README b/README dissimilarity index 97% index 9ec22fdb3..dea5506b4 100644 --- a/README +++ b/README @@ -1,21 +1,51 @@ -The is a distribution of Org-mode, a plain text notes and project planning -tool for Emacs. - -The homepage of Org-mode is at http://orgmode.org - -The manual is in the file org.pdf, it includes a section about installation. - -The xemacs directory contains special code for XEmacs users, in particular -a port of the GNU Emacs outline.el to XEmacs. Org-mode does not work -under XEmacs without this file installed. It did until version 4.37, -but no longer. - -If this is the git project, there are additional directories here: - -CONTRIB - contains bits and pieces contributed by users. These are not yet - part of the Org-mode core, and also not part of Emacs. - -EXPERIMENTAL - files that contain code bits for experimenting. Nothing has been - decided on what to do with these. \ No newline at end of file +This is the Emacs Org project, an emacs subsystem for organizing your life + +The homepage of Org is at http://orgmode.org + +This distribution contains: + +README + This file. + +README_DIST + The README file for the distribution (zip and tar files) + +README_GIT + Information about the git repository and how to contribute + to Org-mode development. + +lisp/ + Directory with all the Emacs Lisp files that make up Org. + +doc/ + The documentation files. org.texi is the source of the + documentation, org.html and org.pdf are formatted versions of it. + +xemacs/ + The xemacs directory contains special code for XEmacs users, in + particular a port of the GNU Emacs outline.el to XEmacs. Org-mode + does not work under XEmacs without this file installed. It did + until version 4.37, but no longer. + +CONTRIB/ + A diretory with third-party additions for Org. Some really cool + stuff is in there. + +ORGWEBPAGE/ + Directory with the source files for the orgmode.org web page. + +ChangeLog + The standard ChangeLog file. + +Makefile + The makefile to compile and install Org, and also for maintenance + tasks. + +request-assign-future.txt + The form that contributors have to sign and get processed with the + FSF before contributed changes can be integrated into the Org + core. All files in this distribution except the CONTRIB directory + have copyright assigned to the FSF. + +EXPERIMENTAL + Experimental code, not necessarily FSF copyright. \ No newline at end of file diff --git a/README_DIST b/README_DIST new file mode 100644 index 000000000..04755287f --- /dev/null +++ b/README_DIST @@ -0,0 +1,45 @@ +The is a distribution of Org, a plain text notes and project planning +tool for Emacs. + +The version of this release is: 6.00pre-1 + +The homepage of Org is at http://orgmode.org + +This distribution contains: + +README + This file. + +lisp/ + Directory with all the Emacs Lisp files that make up Org. + +doc/ + The documentation files. org.texi is the source of the + documentation, org.html and org.pdf are formatted versions of it. + +xemacs/ + The xemacs directory contains special code for XEmacs users, in + particular a port of the GNU Emacs outline.el to XEmacs. Org-mode + does not work under XEmacs without this file installed. It did + until version 4.37, but no longer. + +CONTRIB/ + A diretory with third-party additions for Org. Some really cool + stuff is in there. + +ChangeLog + The standard ChangeLog file, for geeks. + +Changes.org + An Org-mode file listing the user visible changes in each release. + +Makefile + The makefile to compile and install Org. For installation + instructions, see the manual. + +request-assign-future.txt + The form that contributors have to sign and get processed with the + FSF before contributed changes can be integrated into the Org + core. All files in this distribution except the CONTRIB directory + have copyright assigned to the FSF. + diff --git a/UTILITIES/set-version.pl b/UTILITIES/set-version.pl index 7941adb40..e62694fe6 100755 --- a/UTILITIES/set-version.pl +++ b/UTILITIES/set-version.pl @@ -20,5 +20,13 @@ $cmd = qq{s/^\\\\def\\\\orgversionnumber\\{\\S+\\}/\\\\def\\\\orgversionnumber{$ $c1 = "perl -pi -e '$cmd' doc/orgcard.tex"; system($c1); +print STDERR "README_DIST\n"; +$cmd = qq{s/^(The version of this release is:)\\s+(\\S+)[ \t]*\$/\$1 $version/;}; +$c1 = "perl -pi -e '$cmd' README_DIST"; +system($c1); - +print STDERR "ORGWEBPAGE/index.org\n"; +$cmd = qq{s/^(\\* Current Version )\\(\\S+?\\)/\$1($version)/;s/^(The current version is)\\s+(\\S+)\\. /\$1 $version. /}; +$c1 = "perl -pi -e '$cmd' ORGWEBPAGE/index.org"; +print STDERR $c1,"\n"; +system($c1); diff --git a/lisp/org.el b/lisp/org.el index d38cbda44..c2707e5dc 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4790,7 +4790,7 @@ even level numbers will become the next higher odd number." ((< change 0) (max 1 (1+ (* 2 (/ (+ level (* 2 change)) 2)))))) (max 1 (+ level change)))) -(if (featurep 'xemacs) +(if (or (featurep 'xemacs) (< emacs-major-version 23)) (define-obsolete-function-alias 'org-get-legal-level 'org-get-valid-level) (define-obsolete-function-alias 'org-get-legal-level -- 2.11.4.GIT