From: Michael Sweet Date: Tue, 15 Mar 2016 15:36:02 +0000 (-0400) Subject: First set of changes for making build/test environment work with Git. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6d5d8328d79a44061b7fb03c13e522c3ee31294;p=thirdparty%2Fcups.git First set of changes for making build/test environment work with Git. --- diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..ab4c707c9a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,7 @@ +[submodule "development"] + path = development + url = https://github.com/michaelrsweet/cups.git +[submodule "stable"] + path = stable + url = https://github.com/michaelrsweet/cups.git + branch = branch-2.1 diff --git a/README.txt b/README.txt index 3bdafcc2be..1741c29a81 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -README.txt - 2014-11-20 +README.txt - 2016-03-15 ----------------------- This directory contains an automated build and test environment for CUPS. @@ -20,13 +20,13 @@ currently supported: SCRIPTS The build.sh script builds the current stable branch of CUPS along with -trunk, running "make check" in each. Normally you will run the script via -a cron job: +master ("latest"), running "make check" in each. Normally you will run the +script via a cron job: 0 0 * * 0 /path/to/build.sh --update --quiet clean all 0 0 * * 1-6 /path/to/build.sh --update --quiet -The "--update" option tells build.sh to do an "svn up" prior to building. +The "--update" option tells build.sh to do an "git pull" prior to building. The "--quiet" option tells build.sh to work quietly and optionally send the build log via email or HTTP POST for recording, automated processing, etc. diff --git a/build.mak b/build.mak index 36e1c6d6c3..541f300a6e 100644 --- a/build.mak +++ b/build.mak @@ -1,24 +1,22 @@ # -# "$Id: build.mak 10105 2011-11-04 16:32:00Z mike $" +# Makefile for CUPS build and test repository. # -# Makefile for CUPS build and test repository. +# This makefile MUST be used from the build.sh script, otherwise the +# environment will not be configured properly... # -# This makefile MUST be used from the build.sh script, otherwise the -# environment will not be configured properly... +# Copyright 2007-2016 by Apple Inc. +# Copyright 1997-2007 by Easy Software Products, all rights reserved. # -# Copyright 2007-2014 by Apple Inc. -# Copyright 1997-2007 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # Subdirectories to be built... DIRS = \ stable/.all \ - trunk/.all \ + development/.all \ # Make everything... @@ -34,33 +32,10 @@ clean: tools/.clean $(DIRS:.all=.clean) find . -name 'error_log-*' -mtime +7 -print -exec rm -f '{}' \; -# Make EPM -epm/.all: epm/Makefile - @echo Making all in EPM... - cd epm && $(MAKE) test && $(MAKE) install - -epm/.clean: - @cd epm; if test -f Makefile; then \ - echo Cleaning EPM...; \ - $(MAKE) distclean || exit 1; \ - fi - -epm/Makefile: epm/Makefile.in epm/configure - @cd epm; if test -f Makefile; then \ - echo Cleaning EPM...; \ - $(MAKE) distclean || exit 1; \ - fi - @echo Configuring EPM... - cd epm && ./configure $(BUILDOPTIONS) --prefix=$(BASEDIR)/temp - - # Make CUPS stable stable/.all: stable/Makedefs @echo Making all in CUPS stable... cd stable && $(MAKE) all check -# @if test -x /usr/bin/rpm; then \ -# cd stable && tools/testrpm; \ -# fi stable/.clean: @cd stable; if test -f Makedefs; then \ @@ -103,53 +78,50 @@ stable/configure: stable/configure.ac \ cd stable; rm -rf autom4te.cache configure; autoconf -# Make CUPS trunk -trunk/.all: trunk/Makedefs - @echo Making all in CUPS trunk... - cd trunk && $(MAKE) all check -# @if test -x /usr/bin/rpm; then \ -# cd trunk && tools/testrpm; \ -# fi +# Make CUPS master (bleeding edge development) +development/.all: development/Makedefs + @echo Making all in CUPS development... + cd development && $(MAKE) all check -trunk/.clean: - @cd trunk; if test -f Makedefs; then \ - echo Cleaning CUPS trunk...; \ +development/.clean: + @cd development; if test -f Makedefs; then \ + echo Cleaning CUPS development...; \ $(MAKE) distclean || exit 1; \ fi -trunk/Makedefs: trunk/Makedefs.in trunk/configure \ - trunk/packaging/cups.list.in \ - trunk/config.h.in - @cd trunk; if test -f Makedefs; then \ - echo Cleaning CUPS trunk...; \ +development/Makedefs: development/Makedefs.in development/configure \ + development/packaging/cups.list.in \ + development/config.h.in + @cd development; if test -f Makedefs; then \ + echo Cleaning CUPS development...; \ $(MAKE) distclean || exit 1; \ fi - @echo Configuring CUPS trunk... - cd trunk && ./configure $(BUILDOPTIONS) \ + @echo Configuring CUPS development... + cd development && ./configure $(BUILDOPTIONS) \ --enable-static \ --enable-unit-tests --enable-debug-printfs -trunk/configure: trunk/configure.ac \ - trunk/config-scripts/cups-common.m4 \ - trunk/config-scripts/cups-compiler.m4 \ - trunk/config-scripts/cups-defaults.m4 \ - trunk/config-scripts/cups-directories.m4 \ - trunk/config-scripts/cups-dnssd.m4 \ - trunk/config-scripts/cups-gssapi.m4 \ - trunk/config-scripts/cups-largefile.m4 \ - trunk/config-scripts/cups-libtool.m4 \ - trunk/config-scripts/cups-manpages.m4 \ - trunk/config-scripts/cups-network.m4 \ - trunk/config-scripts/cups-opsys.m4 \ - trunk/config-scripts/cups-pam.m4 \ - trunk/config-scripts/cups-poll.m4 \ - trunk/config-scripts/cups-scripting.m4 \ - trunk/config-scripts/cups-sharedlibs.m4 \ - trunk/config-scripts/cups-ssl.m4 \ - trunk/config-scripts/cups-startup.m4 \ - trunk/config-scripts/cups-threads.m4 - @echo Updating CUPS trunk configure script... - cd trunk; rm -rf autom4te.cache configure; autoconf +development/configure: development/configure.ac \ + development/config-scripts/cups-common.m4 \ + development/config-scripts/cups-compiler.m4 \ + development/config-scripts/cups-defaults.m4 \ + development/config-scripts/cups-directories.m4 \ + development/config-scripts/cups-dnssd.m4 \ + development/config-scripts/cups-gssapi.m4 \ + development/config-scripts/cups-largefile.m4 \ + development/config-scripts/cups-libtool.m4 \ + development/config-scripts/cups-manpages.m4 \ + development/config-scripts/cups-network.m4 \ + development/config-scripts/cups-opsys.m4 \ + development/config-scripts/cups-pam.m4 \ + development/config-scripts/cups-poll.m4 \ + development/config-scripts/cups-scripting.m4 \ + development/config-scripts/cups-sharedlibs.m4 \ + development/config-scripts/cups-ssl.m4 \ + development/config-scripts/cups-startup.m4 \ + development/config-scripts/cups-threads.m4 + @echo Updating CUPS development configure script... + cd development; rm -rf autom4te.cache configure; autoconf # Make the build tools tools/.all: tools/Makefile @@ -169,8 +141,3 @@ tools/Makefile: tools/Makefile.in tools/configure fi @echo Configuring Tools... cd tools && ./configure $(BUILDOPTIONS) --prefix=$(BASEDIR)/temp - - -# -# End of "$Id: build.mak 10105 2011-11-04 16:32:00Z mike $". -# diff --git a/build.sh b/build.sh index 658155b643..b556fe1de2 100755 --- a/build.sh +++ b/build.sh @@ -1,18 +1,16 @@ #!/bin/sh # -# "$Id: build.sh 12738 2015-06-15 18:28:48Z msweet $" +# Common script for building the current stable and development (master) +# branches of CUPS. # -# Common script for building the current stable and development (trunk) -# branches of CUPS. +# Copyright 2007-2016 by Apple Inc. +# Copyright 1997-2007 by Easy Software Products, all rights reserved. # -# Copyright 2007-2015 by Apple Inc. -# Copyright 1997-2007 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # # Usage: # diff --git a/stable b/stable new file mode 160000 index 0000000000..b1f200bb75 --- /dev/null +++ b/stable @@ -0,0 +1 @@ +Subproject commit b1f200bb7575c13075c2844ba573153f150ae015