Skip to content
fml mailing list driver version 4 (master repository)
Perl HTML Perl 6 Makefile Emacs Lisp Shell Other
Branch: master
Clone or download
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Permalink
Type Name Latest commit message Commit time
Failed to load latest commit information.
bin
cf
conf
contrib
databases
dist
distrib
doc
drafts
etc
kern
libexec
messages
module
proc
regress
sbin
sys
www
.cvsignore
CHANGES
Makefile
Makefile.local
README
README.Japanese
TODO-4.0.5

README

		How to edit fml CVS repository
		$Date: 2001/08/25 15:42:58 $

CAUTION: you need "BSD make" not gmake.



1. how to hack 

   % cvs -d cvs.fml.org:/cvsroot co fml

	check out cvs tree, edit it and commit it! 
	Please add your changes to "CHANGES". 

2. If you make "snapshot" without .tar.gz

   % cp distrib/mk/fmlmk.conf.example ~/.fmlmk.conf

	Please edit ~/.fmkmk.conf to modify several PATH's
	to fit your environemnt.


3. how to make snapshot with tar.gz

   % cvs -d cvs.fml.org:/cvsroot co fml
   % cp distrib/mk/fmlmk.conf.example ~/.fmlmk.conf
	... edit ~/.fmlmk.conf ...
   % cd fml
   % make snapshot

 XXX If you have no BSD make, 
 XXX run "make bsdmake" here before you run make.

4. how to make release tarball

   % cvs -d cvs.fml.org:/cvsroot co fml
   % cd fml
   % cp distrib/mk/fmlmk.conf.example ~/.fmlmk.conf
	... edit ~/.fmlmk.conf ...
   % echo 4.0.x > conf/release
   % echo 4.0.x > conf/release_version
   % make release


Appendix A:  install "bsd make" on Debian GNU/linux

  I verified you can make bsd make by GNU make on linux famillies.

   % cvs -d cvs.fml.org:/cvsroot co fml
   % cd fml
   % (cd dist/NetBSD; make bsdmake)
   % su
   # cp dist/NetBSD/src/usr.bin/make/bmake /usr/local/bin
   # cp -pr dist/NetBSD/src/share/mk /usr/share


Appendix B: conf/ (maintainer is responsible for these files)

conf/

	release			4.0 4.0A 4.0.1
	release_version		(automatically updated)
	branch			current / stable
	mode			'' / "daily"

"conf/release" is the main trunk revision, which should be set up by hand.
"branch" indicates current or stable, which should be set up by hand.
"mode" is for daily snapshot system.
distrib/bin/fml_version.pl updates "conf/release_version" automatically.


Appendix C: CVSROOT/commitlog

^fml
		-> source-changes@fml.org 
		-> /cvsroot/log/fml/commitlog

^fml/doc
		-> doc-changes@fml.org 
		-> source-changes@fml.org 
		-> /cvsroot/log/fml/commitlog

^fml/distrib/history
		-> /cvsroot/log/fml/commitlog


Appendix D: CVS TAGS, BRANCH


[4.0 series]

      fml-4-0-maint (branch)
     -------------------> 4.0.1 ---------------> 4.0.2
    |                    A          A merge
    |                    |          |
    |                    |-- diff ---  
    |                    |
    |                    | current-20010701
    |                    V
------------------------------------ (current branch)
  A A A
  | | |--- fml-4-0-1-alpha-0   (tag for diff, tagged on 2001/03/19)
  | |----- fml-4-0-1-pre-alpha (tag for diff, to be removed 2001/03/19)
  |
 fml-4-0 (tag)


[3.0 series]

                                 --- 4.0 release branch
                                 |
-- 3.0 --- 3.0A -- 3.0B -- 3.0H --- 4.0A -->	(main trunk)
 |              |
 |              v (import diffs for bug-fix only)
 |
  -- 3.0 -- 3.0.1 -- 3.0.2 --> (stable branch)

stable branch:
  3.0_BETA 3.0 3.0-stable 3.0.1 3.0.1-stable 3.0.2 3.0.2-stable ...
           

*** ASSIGNED TAGS ***

fml-2-1		2.1   release
fml-2-2		2.2   release
fml-2-2-1	2.2.1 release

fml-3-0-maint	3.0 stable branch
fml-3-0		3.0   release
fml-3-0-1	3.0.1 release

fml-4-0-maint	4.0 stable branch
fml-4-0		4.0   release
fml-4-0-1	4.0.1 release

   current-20010701	merge/brake point to road for 4.0.2

fml-4-0-2	4.0.2 release

   current-20010823	base point at that clean up campaign starts

   postfix-verps	Postfix current VERP's hack branch

	break from main:current-20010722

   makefml-rdbms branch	hack makefml to talk with RDBMS

	makefml-rdbms-base	break point of the branch

   p5-style		perl5-ify 
   p5-style-base


*** HOW TO MERGE ***

  1. assign tag to current

	% cvs rtag current-20010701 fml

  2. merge up the patch between fml-4-0-1 and current-20010701

	% cvs update -j fml-4-0-1 -j current-20010701 -d 

	*** "-d" is required

  3. check again

	% cvs diff 

$FML: README,v 1.29 2001/08/25 15:42:58 fukachan Exp $
You can’t perform that action at this time.