Continue WIP
authorKen Brown <kbrown@cornell.edu>
Fri, 19 May 2017 19:28:41 +0000 (15:28 -0400)
committerKen Brown <kbrown@cornell.edu>
Fri, 19 May 2017 19:28:41 +0000 (15:28 -0400)
16 files changed:
.gitignore
prereqs00_do_twice/build.sh [new file with mode: 0755]
prereqs00_do_twice/fix_names.sh [new file with mode: 0755]
prereqs00_do_twice/perl-Archive-Zip/perl-Archive-Zip.cygport [moved from prereqs0_do_twice/perl-Archive-Zip-1.59-1.src/perl-Archive-Zip-1.59-1.cygport with 98% similarity]
prereqs00_do_twice/perl-Exporter-Tiny/perl-Exporter-Tiny.cygport [moved from prereqs0_do_twice/perl-Exporter-Tiny-0.044-1.src/perl-Exporter-Tiny-0.044-1.cygport with 96% similarity]
prereqs00_do_twice/perl-List-MoreUtils-XS/perl-List-MoreUtils-XS.cygport [moved from prereqs0_do_twice/perl-List-MoreUtils-XS-0.418-1.src/perl-List-MoreUtils-XS-0.418-1.cygport with 98% similarity]
prereqs00_do_twice/perl-List-MoreUtils/perl-List-MoreUtils.cygport [moved from prereqs0_do_twice/perl-List-MoreUtils-0.419-1.src/perl-List-MoreUtils-0.419-1.cygport with 98% similarity]
prereqs00_do_twice/perl-Module-Build/achim.patch [moved from prereqs0_do_twice/perl-Module-Build-0.4222-1.src/perl-Module-Build-0.4222-1.src.patch with 100% similarity]
prereqs00_do_twice/perl-Module-Build/perl-Module-Build.cygport [moved from prereqs0_do_twice/perl-Module-Build-0.4222-1.src/perl-Module-Build-0.4222-1.cygport with 97% similarity]
prereqs00_do_twice/perl-PAR-Dist/perl-PAR-Dist.cygport [moved from prereqs0_do_twice/perl-PAR-Dist-0.49-3.src/perl-PAR-Dist-0.49-3.cygport with 97% similarity]
prereqs00_do_twice/perl-SUPER/perl-SUPER.cygport [moved from prereqs0_do_twice/perl-SUPER-1.20141117-1.src/perl-SUPER-1.20141117-1.cygport with 97% similarity]
prereqs00_do_twice/perl-Sub-Identify/perl-Sub-Identify.cygport [moved from prereqs0_do_twice/perl-Sub-Identify-0.14-1.src/perl-Sub-Identify-0.14-1.cygport with 95% similarity]
prereqs00_do_twice/perl-Test-MockModule/perl-Test-MockModule.cygport [moved from prereqs0_do_twice/perl-Test-MockModule-0.11-1.src/perl-Test-MockModule-0.11-1.cygport with 98% similarity]
prereqs00_do_twice/perl-YAML-LibYAML/perl-YAML-LibYAML.cygport [moved from prereqs0_do_twice/perl-YAML-LibYAML-0.64-1.src/perl-YAML-LibYAML-0.64-1.cygport with 95% similarity]
prereqs00_do_twice/perl-inc-latest/perl-inc-latest.cygport [moved from prereqs0_do_twice/perl-inc-latest-0.500-1.src/perl-inc-latest-0.500-1.cygport with 95% similarity]
prereqs0_do_twice/build.sh [deleted file]

index b9823def05a88368ade5e8c3b1b1778fae983bb1..94a3b33a661a31759fee472b7c9744e14f867e3f 100644 (file)
@@ -3,3 +3,9 @@ biber-*-*/
 biber-*.tar.bz2
 *.tar.gz
 *.tgz
+*.noarch/
+*.i686/
+*.x86_64/
+*.log
+build_failures.txt
+test_failures.txt
diff --git a/prereqs00_do_twice/build.sh b/prereqs00_do_twice/build.sh
new file mode 100755 (executable)
index 0000000..9cecf15
--- /dev/null
@@ -0,0 +1,95 @@
+#! /bin/bash
+
+# Run in elevated shell as kbrown-admin.
+
+SYSARCH=$(uname -m)
+if [ ${SYSARCH} = i686 ]
+then
+    GENINI="GEN-ini"
+    DEST_ARCH="x86"
+else
+    GENINI="GEN-ini64"
+    DEST_ARCH="x86_64"
+fi
+
+setup="/c/downloads/cygwin/${DEST_ARCH}.exe"
+
+GENINI() {
+    mksetupini --arch=${DEST_ARCH} --release=kbrown --inifile=${DEST_ARCH}/setup.ini \
+              --okmissing=required-package --okmissing=curr --releasearea .
+cd ${DEST_ARCH}
+xz -c setup.ini > setup.xz
+chown kbrown setup.ini setup.xz
+cd ..
+}
+
+install() {
+    pushd /c/downloads/cygwin/myrepo
+    GENINI
+    popd
+    ${setup} -M -X -L -P $1
+}
+
+mods="
+                               perl-Archive-Zip
+                               perl-YAML-LibYAML
+                              perl-Module-Build
+                              perl-PAR-Dist
+                              perl-SUPER
+                              perl-Sub-Identify
+                              perl-inc-latest
+                             perl-Test-MockModule
+                          perl-List-MoreUtils
+                         perl-Exporter-Tiny
+                         perl-List-MoreUtils-XS
+"
+
+rm -f build_failures.txt test_failures.txt
+touch build_failures.txt test_failures.txt
+chown kbrown build_failures.txt test_failures.txt
+
+export cygport_no_error=1
+
+for m in ${mods}
+do
+    eval $(grep '^NAME=' ${m}/${m}.cygport)
+    eval $(grep '^VERSION=' ${m}/${m}.cygport)
+    eval $(grep '^RELEASE=' ${m}/${m}.cygport)
+    PVR=${NAME}-${VERSION}-${RELEASE}
+    if [ ${RELEASE} = 1 ]
+    then
+       RELEASE=2
+       PVR=${NAME}-${VERSION}-2
+       sed -i -e 's/^RELEASE=.*/RELEASE=2/' ${m}/${m}.cygport
+    fi
+    ARCH=${SYSARCH}
+    eval $(grep '^ARCH=' ${m}/${m}.cygport)
+    if [ ${ARCH} = i686 -o ${SYSARCH} = x86_64 ]
+    then
+       echo "Entering ${m}..."
+       cd ${m} || exit 1
+       echo "Running cygport..."
+       rm -rf ${PVR}.${ARCH}
+       if cygport ${m}.cygport fetch all
+       then
+           cygport ${m}.cygport test || echo $m >> ../test_failures.txt
+           if [ ${ARCH} = noarch ]
+           then
+               dest=/c/downloads/cygwin/myrepo/noarch/release/
+           else
+               dest=/c/downloads/cygwin/myrepo/${DEST_ARCH}/release/
+           fi
+           chown -R kbrown .
+           rm -rf ${dest}/${m}
+           cp -alf ${PVR}.${ARCH}/dist/${m} ${dest}
+           install ${m}
+       else
+           echo ${m} >> ../build_failures.txt
+           chown -R kbrown .
+       fi
+       echo "Leaving ${m}."
+       cd ..
+    else
+       install ${m}
+    fi
+done
diff --git a/prereqs00_do_twice/fix_names.sh b/prereqs00_do_twice/fix_names.sh
new file mode 100755 (executable)
index 0000000..4e2ae63
--- /dev/null
@@ -0,0 +1,33 @@
+#! /bin/bash
+
+for d in *.src
+do
+    if [ -d ${d} ]
+    then
+       m=$(echo ${d} | sed -e 's/[-.0-9]*\.src$//')
+       mv ${d} ${m} || exit 1
+       echo "Entering ${m}..."
+       cd ${m} || exit 1
+       eval $(grep '^VERSION=' *.cygport)
+       if [ -f ${m}-${VERSION}-1.cygport ]
+       then
+           mv ${m}-${VERSION}-1.cygport ${m}.cygport || exit 1
+       fi
+       if [ -f ${m}-${VERSION}-1.src.patch ]
+       then
+           mv ${m}-${VERSION}-1.src.patch achim.patch || exit 1
+           echo 'PATCH_URI="achim.patch"' >> ${m}/${m}.cygport || exit 1
+       fi
+       eval $(grep '^RELEASE=' *.cygport)
+       if [ ${RELEASE} = 1 ]
+       then
+           sed -i -e 's/^RELEASE=.*/RELEASE=2/' ${m}.cygport
+       fi
+       if [ ${RELEASE} != 2 ]
+       then
+           echo "Warning: RELEASE = ${RELEASE}."
+       fi
+       echo "Leaving ${m}."
+       cd ..
+    fi
+done
similarity index 98%
rename from prereqs0_do_twice/perl-Archive-Zip-1.59-1.src/perl-Archive-Zip-1.59-1.cygport
rename to prereqs00_do_twice/perl-Archive-Zip/perl-Archive-Zip.cygport
index ab5cce746583399d2d91eb9d591b0d94f6b1d094..f4369dcb7167cbbce165c973064a10be2448591b 100644 (file)
@@ -9,7 +9,7 @@ if [ "x$cygport_no_error" == "x" ] && ! check_perl_module $_ml; then
 fi
 NAME="perl-Archive-Zip"
 VERSION="1.59"
-RELEASE="1"
+RELEASE=2
 CPAN_AUTHOR="PHRED"
 DESCRIPTION="Perl distribution Archive-Zip, providing Perl modules:
 Archive::Zip Archive::Zip::Archive Archive::Zip::BufferedFileHandle
similarity index 96%
rename from prereqs0_do_twice/perl-Exporter-Tiny-0.044-1.src/perl-Exporter-Tiny-0.044-1.cygport
rename to prereqs00_do_twice/perl-Exporter-Tiny/perl-Exporter-Tiny.cygport
index 9ec61c2af828ead2803428d4cfecd53c01e93bc3..71c8e279a8499d547536d522ecd26137d5a28095 100644 (file)
@@ -1,6 +1,6 @@
 NAME="perl-Exporter-Tiny"
 VERSION="0.044"
-RELEASE="1"
+RELEASE=2
 CPAN_AUTHOR="TOBYINK"
 DESCRIPTION="Perl distribution Exporter-Tiny, providing Perl modules:
 Exporter::Shiny Exporter::Tiny.
similarity index 98%
rename from prereqs0_do_twice/perl-List-MoreUtils-XS-0.418-1.src/perl-List-MoreUtils-XS-0.418-1.cygport
rename to prereqs00_do_twice/perl-List-MoreUtils-XS/perl-List-MoreUtils-XS.cygport
index f97752fdff08a143fa8a6289cc61b0a993541f85..a5381398d647385142f2ac65695185600dea3176 100644 (file)
@@ -9,7 +9,7 @@ if [ "x$cygport_no_error" == "x" ] && ! check_perl_module $_ml; then
 fi
 NAME="perl-List-MoreUtils-XS"
 VERSION="0.418"
-RELEASE="1"
+RELEASE=2
 CPAN_AUTHOR="REHSACK"
 DESCRIPTION="Perl distribution List-MoreUtils-XS, providing Perl modules:
 List::MoreUtils::XS.
similarity index 98%
rename from prereqs0_do_twice/perl-List-MoreUtils-0.419-1.src/perl-List-MoreUtils-0.419-1.cygport
rename to prereqs00_do_twice/perl-List-MoreUtils/perl-List-MoreUtils.cygport
index 71eb2fd548aa9c1be0148285a1f7ed861b65556b..7d597b0052f60970946668396fd2bc54d30a9528 100644 (file)
@@ -9,7 +9,7 @@ if [ "x$cygport_no_error" == "x" ] && ! check_perl_module $_ml; then
 fi
 NAME="perl-List-MoreUtils"
 VERSION="0.419"
-RELEASE="1"
+RELEASE=2
 CPAN_AUTHOR="REHSACK"
 DESCRIPTION="Perl distribution List-MoreUtils, providing Perl modules:
 List::MoreUtils List::MoreUtils::PP.
similarity index 97%
rename from prereqs0_do_twice/perl-Module-Build-0.4222-1.src/perl-Module-Build-0.4222-1.cygport
rename to prereqs00_do_twice/perl-Module-Build/perl-Module-Build.cygport
index 8e7f30d0ec880bd72086ebf215ee9ca3c1165873..69f1e387229f1e2dbca8984268a8cb54ce0a1ae7 100644 (file)
@@ -9,7 +9,7 @@ if [ "x$cygport_no_error" == "x" ] && ! check_perl_module $_ml; then
 fi
 NAME="perl-Module-Build"
 VERSION="0.4222"
-RELEASE="1"
+RELEASE=2
 CPAN_AUTHOR="LEONT"
 DESCRIPTION="Perl distribution Module-Build, providing Perl modules:
 Module::Build Module::Build::Base Module::Build::Compat
@@ -30,3 +30,4 @@ DIFF_EXCLUDES="MYMETA.*"
 NO_PERL_DEPS=1
 REQUIRES="perl-PAR-Dist perl-inc-latest"
 inherit perl
+PATCH_URI="achim.patch"
similarity index 97%
rename from prereqs0_do_twice/perl-PAR-Dist-0.49-3.src/perl-PAR-Dist-0.49-3.cygport
rename to prereqs00_do_twice/perl-PAR-Dist/perl-PAR-Dist.cygport
index aace8fba0d30eaff9c6aff01b1998068b09d0bb6..f9f3675ec80a0f32067d3a1af5c9f8ec6b3d61fd 100755 (executable)
@@ -9,7 +9,7 @@ if ! check_perl_module $_ml; then
 fi
 NAME="perl-PAR-Dist"
 VERSION="0.49"
-RELEASE="3"
+RELEASE="4"
 CPAN_AUTHOR="RSCHUPP"
 DESCRIPTION="Perl distribution PAR-Dist, providing Perl modules:
 PAR::Dist.
similarity index 97%
rename from prereqs0_do_twice/perl-SUPER-1.20141117-1.src/perl-SUPER-1.20141117-1.cygport
rename to prereqs00_do_twice/perl-SUPER/perl-SUPER.cygport
index 2a4466f559f8e5dc128b3c30d6cf08d74a40420b..3049caef8de086345ae99ae4b6ff44c88e3c2ee8 100644 (file)
@@ -9,7 +9,7 @@ if [ "x$cygport_no_error" == "x" ] && ! check_perl_module $_ml; then
 fi
 NAME="perl-SUPER"
 VERSION="1.20141117"
-RELEASE="1"
+RELEASE=2
 CPAN_AUTHOR="CHROMATIC"
 DESCRIPTION="Perl distribution SUPER, providing Perl modules:
 SUPER.
similarity index 95%
rename from prereqs0_do_twice/perl-Sub-Identify-0.14-1.src/perl-Sub-Identify-0.14-1.cygport
rename to prereqs00_do_twice/perl-Sub-Identify/perl-Sub-Identify.cygport
index 63997358b86e354dd7a1781194ad67e676fa2904..872feba2ee54f14241453b4b4bf940bf75c5bd52 100644 (file)
@@ -1,6 +1,6 @@
 NAME="perl-Sub-Identify"
 VERSION="0.14"
-RELEASE="1"
+RELEASE=2
 CPAN_AUTHOR="RGARCIA"
 DESCRIPTION="Perl distribution Sub-Identify, providing Perl modules:
 Sub::Identify.
similarity index 98%
rename from prereqs0_do_twice/perl-Test-MockModule-0.11-1.src/perl-Test-MockModule-0.11-1.cygport
rename to prereqs00_do_twice/perl-Test-MockModule/perl-Test-MockModule.cygport
index cc96eaf85ccbe97ef3ff0e846672f600eff332ab..5ecaec2ee081a0fa25254804b25e42a04af0f1be 100644 (file)
@@ -9,7 +9,7 @@ if [ "x$cygport_no_error" == "x" ] && ! check_perl_module $_ml; then
 fi
 NAME="perl-Test-MockModule"
 VERSION="0.11"
-RELEASE="1"
+RELEASE=2
 CPAN_AUTHOR="GFRANKS"
 DESCRIPTION="Perl distribution Test-MockModule, providing Perl modules:
 Test::MockModule.
similarity index 95%
rename from prereqs0_do_twice/perl-YAML-LibYAML-0.64-1.src/perl-YAML-LibYAML-0.64-1.cygport
rename to prereqs00_do_twice/perl-YAML-LibYAML/perl-YAML-LibYAML.cygport
index b6890d76c95deb7fd9b4d8a7bc49a4aa7f0846f1..c26485e9042da82d085d2864458ac369b060b660 100644 (file)
@@ -1,6 +1,6 @@
 NAME="perl-YAML-LibYAML"
 VERSION="0.64"
-RELEASE="1"
+RELEASE=2
 CPAN_AUTHOR="TINITA"
 DESCRIPTION="Perl distribution YAML-LibYAML, providing Perl modules:
 YAML::LibYAML YAML::XS YAML::XS::LibYAML.
similarity index 95%
rename from prereqs0_do_twice/perl-inc-latest-0.500-1.src/perl-inc-latest-0.500-1.cygport
rename to prereqs00_do_twice/perl-inc-latest/perl-inc-latest.cygport
index a4e762b3a0c3729a9fb1a759c833606309eac8f7..20dc67ceff563b8fdf6d4e1542c20351aadac5e7 100755 (executable)
@@ -1,6 +1,6 @@
 NAME="perl-inc-latest"
 VERSION="0.500"
-RELEASE="1"
+RELEASE=2
 CPAN_AUTHOR="DAGOLDEN"
 DESCRIPTION="Perl distribution inc-latest, providing Perl modules:
 inc::latest inc::latest::private.
diff --git a/prereqs0_do_twice/build.sh b/prereqs0_do_twice/build.sh
deleted file mode 100755 (executable)
index 0b0bb98..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/bash
-
-SYSARCH=$(uname -m)
-
-mods="
-                               perl-Archive-Zip
-                               perl-YAML-LibYAML
-                              perl-Module-Build
-                              perl-PAR-Dist
-                              perl-SUPER
-                              perl-Sub-Identify
-                              perl-inc-latest
-                             perl-Test-MockModule
-                          perl-List-MoreUtils
-                         perl-Exporter-Tiny
-                         perl-List-MoreUtils-XS
-"
-
-rm -f build_failures.txt
-rm -f test_failures.txt
-touch build_failures.txt
-touch test_failures.txt
-exit_status=0
-for m in $mods
-do
-    mv -f ${m}* ${m}
-    cd ${m}
-    eval $(grep ^NAME *.cygport)
-    eval $(grep ^VERSION *.cygport)
-    eval $(grep ^RELEASE *.cygport)
-    ARCH=${SYSARCH}
-    eval $(grep ^ARCH *.cygport)
-    PVR=${NAME}-${VERSION}-${RELEASE}
-    mv -f ${PVR}.cygport ${NAME}.cygport
-    if [ -f ${NAME}-${VERSION}-${RELEASE}.src.patch ]
-    then
-       mv ${NAME}-${VERSION}-${RELEASE}.src.patch achim.patch
-       echo 'PATCH_URI="achim.patch"' >> ${NAME}.cygport
-    fi
-    if [ ${RELEASE} = 1 ]
-    then
-       sed -i -e 's/RELEASE=1/RELEASE=2' ${NAME}.cygport
-    fi
-    echo "Building $m..."
-    if cygport ${NAME}.cygport all
-    then
-       cygport ${NAME}.cygport test || echo $m >> ../test_failures.txt
-       if [ ${SYSARCH} = x86_64 ]
-       then
-           cp -alf $
-       else
-           DEST_ARCH=${ARCH}
-       fi
-       cp -alf 
-       
-
-
-       exit_status=1
-       echo $m >> ../build_failures.txt
-       
-       
-   
This page took 0.042393 seconds and 5 git commands to generate.