From owner-svn-ports-all@freebsd.org Fri Mar 4 14:16:02 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1D3A9DAA8E; Fri, 4 Mar 2016 14:16:01 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C91E4D62; Fri, 4 Mar 2016 14:16:01 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u24EG0B5098851; Fri, 4 Mar 2016 14:16:00 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u24EG0RF098848; Fri, 4 Mar 2016 14:16:00 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201603041416.u24EG0RF098848@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Fri, 4 Mar 2016 14:16:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410122 - in head/devel/llvm-cheri: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Mar 2016 14:16:02 -0000 Author: brooks Date: Fri Mar 4 14:16:00 2016 New Revision: 410122 URL: https://svnweb.freebsd.org/changeset/ports/410122 Log: Update to a March 3rd snapshot. Update the Makefile.snapshot generate script to fine the date of the most recent change rather than using today's date. Modified: head/devel/llvm-cheri/Makefile.snapshot head/devel/llvm-cheri/distinfo head/devel/llvm-cheri/files/gen-Makefile.snapshot.sh Modified: head/devel/llvm-cheri/Makefile.snapshot ============================================================================== --- head/devel/llvm-cheri/Makefile.snapshot Fri Mar 4 13:47:23 2016 (r410121) +++ head/devel/llvm-cheri/Makefile.snapshot Fri Mar 4 14:16:00 2016 (r410122) @@ -6,8 +6,8 @@ # LLVM_MAJOR= 3.8 LLVM_RELEASE= ${LLVM_MAJOR}.0 -SNAPDATE= 20160216 +SNAPDATE= 20160303 -LLVM_COMMIT= da5d1f184ba4e0c02337fd3bbb4b606fb4ead313 -CLANG_COMMIT= b1e9b7bba8e82f106fece055792e7240114a307a +LLVM_COMMIT= 388f6926b8f9bb0557c65b74badb8a34734f13dc +CLANG_COMMIT= 473591c52d2160071616e8574dc80305abfdda52 LLDB_COMMIT= 7ee5905d0109a13d543a127a9cda7c280c8103c8 Modified: head/devel/llvm-cheri/distinfo ============================================================================== --- head/devel/llvm-cheri/distinfo Fri Mar 4 13:47:23 2016 (r410121) +++ head/devel/llvm-cheri/distinfo Fri Mar 4 14:16:00 2016 (r410122) @@ -1,4 +1,4 @@ -SHA256 (CTSRD-CHERI-llvm-3.8.d20160216-da5d1f184ba4e0c02337fd3bbb4b606fb4ead313_GH0.tar.gz) = 7981f868ca0485b4f4c8c6874e9e2bd889380093a8ed4dba2cb682d7b930f17a -SIZE (CTSRD-CHERI-llvm-3.8.d20160216-da5d1f184ba4e0c02337fd3bbb4b606fb4ead313_GH0.tar.gz) = 22368640 -SHA256 (CTSRD-CHERI-clang-b1e9b7bba8e82f106fece055792e7240114a307a_GH0.tar.gz) = 0b8dd23071b6bc9bfdb2ce306ecf9a0ae865f2bc4f1c43502576d89d30c26c1d -SIZE (CTSRD-CHERI-clang-b1e9b7bba8e82f106fece055792e7240114a307a_GH0.tar.gz) = 12885855 +SHA256 (CTSRD-CHERI-llvm-3.8.d20160303-388f6926b8f9bb0557c65b74badb8a34734f13dc_GH0.tar.gz) = 8ceac98a4bb053c328f7e689832100d94bf5748e4f4fb335f88860b787176521 +SIZE (CTSRD-CHERI-llvm-3.8.d20160303-388f6926b8f9bb0557c65b74badb8a34734f13dc_GH0.tar.gz) = 22354244 +SHA256 (CTSRD-CHERI-clang-473591c52d2160071616e8574dc80305abfdda52_GH0.tar.gz) = f5638a7845db7066b6453908bf9f1a77f41a3d45914b7b103dc7552290a1a4b0 +SIZE (CTSRD-CHERI-clang-473591c52d2160071616e8574dc80305abfdda52_GH0.tar.gz) = 12886568 Modified: head/devel/llvm-cheri/files/gen-Makefile.snapshot.sh ============================================================================== --- head/devel/llvm-cheri/files/gen-Makefile.snapshot.sh Fri Mar 4 13:47:23 2016 (r410121) +++ head/devel/llvm-cheri/files/gen-Makefile.snapshot.sh Fri Mar 4 14:16:00 2016 (r410122) @@ -4,12 +4,37 @@ # curl and jq. Uses unauthenticated access which is ratelimited to 60 # queries per hour. -get_repo_sha() +REPOS_URL=https://api.github.com/repos/CTSRD-CHERI +MAX_DATE=1970101 + +tmpfile=`mktemp -t gen-Makefile.snapshot` + +query_repo() { - curl https://api.github.com/repos/CTSRD-CHERI/$1/branches/master | \ - jq -r '.commit.sha' + curl ${REPOS_URL}/$1/branches/master > $tmpfile + + # Accumulate the dates of the last commits to find the snapshot date + committime=`jq -r '.commit.commit.committer.date' $tmpfile` + committime=${committime%%T*} + year=${committime%%-*} + month=${committime%-*} + month=${month#*-} + day=${committime##*-} + dateint=${year}${month}${day} + if [ $dateint -gt $MAX_DATE ]; then + export MAX_DATE=$dateint + fi + + SHA=`jq -r '.commit.sha' $tmpfile` } +query_repo llvm +LLVM_COMMIT=$SHA +query_repo clang +CLANG_COMMIT=$SHA +query_repo lldb +LLDB_COMMIT=$SHA + cat < Makefile.snapshot # \$FreeBSD\$ # @@ -19,9 +44,11 @@ cat < Makefile.snapshot # LLVM_MAJOR= 3.8 LLVM_RELEASE= \${LLVM_MAJOR}.0 -SNAPDATE= $(date +%Y%m%d) +SNAPDATE= ${MAX_DATE} -LLVM_COMMIT= $(get_repo_sha llvm) -CLANG_COMMIT= $(get_repo_sha clang) -LLDB_COMMIT= $(get_repo_sha lldb) +LLVM_COMMIT= ${LLVM_COMMIT} +CLANG_COMMIT= ${CLANG_COMMIT} +LLDB_COMMIT= ${LLDB_COMMIT} EOF + +rm -f $tmpfile