diff --git a/.boring b/.boring deleted file mode 100644 index bb1da2b2..00000000 --- a/.boring +++ /dev/null @@ -1,128 +0,0 @@ -# Boring file regexps: - -### compiler and interpreter intermediate files -# haskell (ghc) interfaces -\.hi$ -\.hi-boot$ -\.o-boot$ -# object files -\.o$ -\.o\.cmd$ -# profiling haskell -\.p_hi$ -\.p_o$ -# haskell program coverage resp. profiling info -\.tix$ -\.prof$ -# fortran module files -\.mod$ -# linux kernel -\.ko\.cmd$ -\.mod\.c$ -(^|/)\.tmp_versions($|/) -# *.ko files aren't boring by default because they might -# be Korean translations rather than kernel modules -# \.ko$ -# python, emacs, java byte code -\.py[co]$ -\.elc$ -\.class$ -# objects and libraries; lo and la are libtool things -\.(obj|a|exe|so|lo|la)$ -# compiled zsh configuration files -\.zwc$ -# Common LISP output files for CLISP and CMUCL -\.(fas|fasl|sparcf|x86f)$ - -### build and packaging systems -# cabal intermediates -\.installed-pkg-config -\.setup-config -# standard cabal build dir, might not be boring for everybody -# ^dist(/|$) -# autotools -(^|/)autom4te\.cache($|/) -(^|/)config\.(log|status)$ -# microsoft web expression, visual studio metadata directories -\_vti_cnf$ -\_vti_pvt$ -# gentoo tools -\.revdep-rebuild.* -# generated dependencies -^\.depend$ - -### version control systems -# cvs -(^|/)CVS($|/) -\.cvsignore$ -# cvs, emacs locks -^\.# -# rcs -(^|/)RCS($|/) -,v$ -# subversion -(^|/)\.svn($|/) -# mercurial -(^|/)\.hg($|/) -# git -(^|/)\.git($|/) -# bzr -\.bzr$ -# sccs -(^|/)SCCS($|/) -# darcs -(^|/)_darcs($|/) -(^|/)\.darcsrepo($|/) -^\.darcs-temp-mail$ --darcs-backup[[:digit:]]+$ -# gnu arch -(^|/)(\+|,) -(^|/)vssver\.scc$ -\.swp$ -(^|/)MT($|/) -(^|/)\{arch\}($|/) -(^|/).arch-ids($|/) -# bitkeeper -(^|/)BitKeeper($|/) -(^|/)ChangeSet($|/) - -### miscellaneous -# backup files -~$ -\.bak$ -\.BAK$ -# patch originals and rejects -\.orig$ -\.rej$ -# X server -\..serverauth.* -# image spam -\# -(^|/)Thumbs\.db$ -# vi, emacs tags -(^|/)(tags|TAGS)$ -#(^|/)\.[^/] -# core dumps -(^|/|\.)core$ -# partial broken files (KIO copy operations) -\.part$ -# waf files, see http://code.google.com/p/waf/ -(^|/)\.waf-[[:digit:].]+-[[:digit:]]+($|/) -(^|/)\.lock-wscript$ -# mac os finder -(^|/)\.DS_Store$ - -### EPICS build system generated directories -/O\. -^bin($|/) -^cfg($|/) -^db($|/) -^dbd($|/) -^include($|/) -^lib($|/) -^html($|/) - -### Sequencer -^seq\. -# darcs patches received or created locally -^.*\.dpatch$ diff --git a/Makefile b/Makefile index 0e29552f..2dd66066 100644 --- a/Makefile +++ b/Makefile @@ -12,17 +12,6 @@ test_DEPEND_DIRS = src DIRS += examples examples_DEPEND_DIRS = src -BRANCH = 2-2 -DEFAULT_REPO = /opt/repositories/controls/darcs/epics/support/seq/branch-$(BRANCH) -GIT_MIRROR = /opt/repositories/controls/git/seq/branch-$(BRANCH) -SEQ_PATH = www/control/SoftDist/sequencer-$(BRANCH) -USER_AT_HOST = wwwcsr@www-csr.bessy.de -DATE = $(shell date -I) -SNAPSHOT = seq-$(BRANCH)-snapshot-$(DATE) -SEQ_TAG = R$(subst .,-,$(SEQ_RELEASE)) -SEQ_TAG_TIME = $(shell darcs changes --all --xml-output \ - --matches 'exact "TAG $(SEQ_TAG)"' | perl -ne 'print "$$1.$$2" if /date=.(\d{12})(\d{2})/') - include $(TOP)/configure/RULES_TOP html: src @@ -36,37 +25,4 @@ docs.clean: realclean clean: docs.clean -upload_docs: docs - rsync -r -t $(TOP)/html/ $(USER_AT_HOST):$(SEQ_PATH)/ - -recreate_git_mirror: - rm -rf $(GIT_MIRROR) - git init $(GIT_MIRROR) - touch $(GIT_MIRROR)/git.marks - -upload_repo: - darcs push $(DEFAULT_REPO) - cd $(DEFAULT_REPO) && darcs push --all $(USER_AT_HOST):$(SEQ_PATH)/repo/branch-$(BRANCH) - cd $(DEFAULT_REPO) && darcs convert export --read-marks $(GIT_MIRROR)/darcs.marks --write-marks $(GIT_MIRROR)/darcs.marks |\ - (cd $(GIT_MIRROR) && git fast-import --import-marks=git.marks --export-marks=git.marks) - cd $(GIT_MIRROR)/.git && git --bare update-server-info - rsync -r --delete $(GIT_MIRROR)/.git/ $(USER_AT_HOST):$(SEQ_PATH)/repo/branch-$(BRANCH).git/ - -snapshot: - darcs dist -d $(SNAPSHOT) - rsync $(SNAPSHOT).tar.gz $(USER_AT_HOST):$(SEQ_PATH)/releases/ - ssh $(USER_AT_HOST) 'cd $(SEQ_PATH)/releases && ln -f -s $(SNAPSHOT).tar.gz seq-$(BRANCH)-snapshot-latest.tar.gz' - $(RM) $(SNAPSHOT).tar.gz - -release: upload_docs upload_repo - darcs show files | xargs touch -t $(SEQ_TAG_TIME) - darcs dist -d seq-$(SEQ_RELEASE) -t '^$(SEQ_TAG)$$' - rsync seq-$(SEQ_RELEASE).tar.gz $(USER_AT_HOST):$(SEQ_PATH)/releases/ - $(RM) seq-$(SEQ_RELEASE).tar.gz - -changelog: force - DARCS_ALWAYS_COLOR=0 darcs changes -a --from-tag=. | egrep -v '^(Author|Date|patch)' > changelog - -force: - -.PHONY: html docs docs.clean upload_docs mirror upload_repo snapshot release recreate_git_mirror +.PHONY: html docs docs.clean diff --git a/README b/README index e83b21cd..47dff9b3 100644 --- a/README +++ b/README @@ -27,4 +27,4 @@ Plans.txt New features, ideas, and wishes You can also view the documentation online at -http://www-csr.bessy.de/control/SoftDist/sequencer/ +https://epics-modules.github.io/sequencer/ diff --git a/documentation/Installation.txt b/documentation/Installation.txt index b78090e0..9067b03e 100644 --- a/documentation/Installation.txt +++ b/documentation/Installation.txt @@ -78,7 +78,7 @@ If you want to help testing, please clone :: git clone https://github.com/epics-modules/sequencer.git -See `Contribute`_ for a short description how to record and send patches. +See `Contribute`_ for a short description how to prepare changes. .. _2.2.9: https://github.com/epics-modules/sequencer/releases/tag/R2-2-9 .. _2.2.8: https://github.com/epics-modules/sequencer/releases/tag/R2-2-8 @@ -89,9 +89,6 @@ See `Contribute`_ for a short description how to record and send patches. .. _2.2.3: https://github.com/epics-modules/sequencer/releases/tag/R2-2-3 .. _2.2.2: https://github.com/epics-modules/sequencer/releases/tag/R2-2-2 .. _2.2.1: https://github.com/epics-modules/sequencer/releases/tag/R2-2-1 -.. _branch-2-1: https://hub.darcs.net/bf/seq-branch-2-1 -.. _branch-2-2: https://hub.darcs.net/bf/seq-branch-2-2 -.. _branch-2-3: https://hub.darcs.net/bf/seq-branch-2-3 Unpack ------