From 866582439ac2410e5ae98c3387718b7a28e04917 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 1 Feb 2018 15:07:35 -0500 Subject: Move the migration scripts and data to the attic Signed-off-by: Adam Jackson --- attic/merge-makefile | 19 +++++++++++++++++++ attic/merge-protos | 6 ++++++ attic/move-protos | 21 +++++++++++++++++++++ attic/protos | 38 ++++++++++++++++++++++++++++++++++++++ merge-makefile | 19 ------------------- merge-protos | 6 ------ move-protos | 21 --------------------- protos | 38 -------------------------------------- 8 files changed, 84 insertions(+), 84 deletions(-) create mode 100644 attic/merge-makefile create mode 100644 attic/merge-protos create mode 100644 attic/move-protos create mode 100644 attic/protos delete mode 100644 merge-makefile delete mode 100644 merge-protos delete mode 100644 move-protos delete mode 100644 protos diff --git a/attic/merge-makefile b/attic/merge-makefile new file mode 100644 index 0000000..9bdba77 --- /dev/null +++ b/attic/merge-makefile @@ -0,0 +1,19 @@ +#!/bin/sh + +for i in `cat protos`; do + sed -e "s/^pkgconfig/${i}pkgconfig/" \ + -e "s/EXTRA_DIST/${i}_EXTRA_DIST/" \ + -e 's/#.*$//' \ + -e '/MAINTAINERCLEANFILES/d' \ + -e '/PHONY/d' \ + -e '/SUBDIRS=specs/d' \ + -e '/ChangeLog/d' \ + -e '/CHANGELOG/d' \ + -e '/INSTALL/d' \ + -e '/dist-hook/d' \ + $i/Makefile.am +done | cat -s | + awk '/dist_doc_DATA/ { doc[ndoc++] = $3; } + { print $0 } + END { print "SUBDIRS=specs"; print; print "dist_doc_DATA = \\"; for (i in doc) printf "\t%s \\\n", doc[i]; }' + diff --git a/attic/merge-protos b/attic/merge-protos new file mode 100644 index 0000000..758fc46 --- /dev/null +++ b/attic/merge-protos @@ -0,0 +1,6 @@ +#!/bin/sh + +for i in `cat protos | grep -v x11proto`; do + git merge --allow-unrelated-histories $i/master --commit --no-edit -m"Merge $i" + ./move-protos $i +done diff --git a/attic/move-protos b/attic/move-protos new file mode 100644 index 0000000..8539ae9 --- /dev/null +++ b/attic/move-protos @@ -0,0 +1,21 @@ +#!/bin/sh + +case $# in + 1) + me="$1" + ;; + *) + echo 'Usage: $0 ' + exit 1 + ;; +esac + +for i in `cat duplicate-files`; do + if [ -f $i ]; then + mkdir -p $me/`dirname $i` + echo git mv $i $me/$i + git mv $i $me/$i + fi +done + +git commit -m"Move common $me files out of the way" diff --git a/attic/protos b/attic/protos new file mode 100644 index 0000000..0022f1d --- /dev/null +++ b/attic/protos @@ -0,0 +1,38 @@ +applewmproto +bigreqsproto +calibrateproto +compositeproto +damageproto +dmxproto +dri2proto +dri3proto +evieproto +fixesproto +fontcacheproto +fontsproto +glproto +inputproto +kbproto +lg3dproto +panoramixproto +pmproto +presentproto +printproto +randrproto +recordproto +renderproto +resourceproto +scrnsaverproto +trapproto +videoproto +windowswmproto +x11proto +xcmiscproto +xextproto +xf86bigfontproto +xf86dgaproto +xf86driproto +xf86miscproto +xf86rushproto +xf86vidmodeproto +xineramaproto diff --git a/merge-makefile b/merge-makefile deleted file mode 100644 index 9bdba77..0000000 --- a/merge-makefile +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -for i in `cat protos`; do - sed -e "s/^pkgconfig/${i}pkgconfig/" \ - -e "s/EXTRA_DIST/${i}_EXTRA_DIST/" \ - -e 's/#.*$//' \ - -e '/MAINTAINERCLEANFILES/d' \ - -e '/PHONY/d' \ - -e '/SUBDIRS=specs/d' \ - -e '/ChangeLog/d' \ - -e '/CHANGELOG/d' \ - -e '/INSTALL/d' \ - -e '/dist-hook/d' \ - $i/Makefile.am -done | cat -s | - awk '/dist_doc_DATA/ { doc[ndoc++] = $3; } - { print $0 } - END { print "SUBDIRS=specs"; print; print "dist_doc_DATA = \\"; for (i in doc) printf "\t%s \\\n", doc[i]; }' - diff --git a/merge-protos b/merge-protos deleted file mode 100644 index 758fc46..0000000 --- a/merge-protos +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -for i in `cat protos | grep -v x11proto`; do - git merge --allow-unrelated-histories $i/master --commit --no-edit -m"Merge $i" - ./move-protos $i -done diff --git a/move-protos b/move-protos deleted file mode 100644 index 8539ae9..0000000 --- a/move-protos +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -case $# in - 1) - me="$1" - ;; - *) - echo 'Usage: $0 ' - exit 1 - ;; -esac - -for i in `cat duplicate-files`; do - if [ -f $i ]; then - mkdir -p $me/`dirname $i` - echo git mv $i $me/$i - git mv $i $me/$i - fi -done - -git commit -m"Move common $me files out of the way" diff --git a/protos b/protos deleted file mode 100644 index 0022f1d..0000000 --- a/protos +++ /dev/null @@ -1,38 +0,0 @@ -applewmproto -bigreqsproto -calibrateproto -compositeproto -damageproto -dmxproto -dri2proto -dri3proto -evieproto -fixesproto -fontcacheproto -fontsproto -glproto -inputproto -kbproto -lg3dproto -panoramixproto -pmproto -presentproto -printproto -randrproto -recordproto -renderproto -resourceproto -scrnsaverproto -trapproto -videoproto -windowswmproto -x11proto -xcmiscproto -xextproto -xf86bigfontproto -xf86dgaproto -xf86driproto -xf86miscproto -xf86rushproto -xf86vidmodeproto -xineramaproto -- cgit v1.2.3