diff --git a/dist/build-universal.sh b/dist/build-universal.sh index f55a4b2d3..dbc9ec4ee 100755 --- a/dist/build-universal.sh +++ b/dist/build-universal.sh @@ -5,7 +5,7 @@ # build-universal.sh # # ./build-universal.sh development dev biber 0 0 1 -# +# # is a SF subdir of /home/frs/project/biblatex-biber/ # is a git branch to checkout on the build farm servers # is the name of the biber binary to use for the release. @@ -35,13 +35,13 @@ cd $BASE git checkout $BRANCH git pull perl ./Build.PL -sudo ./Build installdeps -sudo ./Build install +./Build installdeps +./Build install cd $BINDIR/darwin_arm64 $SCANCACHE./build.sh ~/bin/pp_osx_codesign_fix biber-darwin_arm64 cd $BASE -sudo ./Build realclean +./Build realclean cd $BINDIR/darwin_arm64 \rm -rf biber-darwin_arm64.tar.gz @@ -56,12 +56,12 @@ echo "Downloading x86_64 binary ... make sure it's the one you want" \rm -rf biber-darwin_universal.tar.gz \rm -rf biber-darwin_x86_64.tar.gz \rm -rf $BINARYNAME -/opt/local/bin/wget --content-disposition --level=0 -c https://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/$RELEASE/binaries/MacOS/biber-darwin_x86_64.tar.gz -O biber-darwin_x86_64.tar.gz -gnutar zxf biber-darwin_x86_64.tar.gz +/opt/homebrew/bin/wget --content-disposition --level=0 -c https://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/$RELEASE/binaries/MacOS/biber-darwin_x86_64.tar.gz -O biber-darwin_x86_64.tar.gz +gtar zxf biber-darwin_x86_64.tar.gz mv $BINARYNAME biber-darwin_x86_64 /usr/bin/lipo -create -output $BINARYNAME biber-darwin_x86_64 biber-darwin_arm64 chmod +x $BINARYNAME -gnutar cf biber-darwin_universal.tar $BINARYNAME +gtar cf biber-darwin_universal.tar $BINARYNAME gzip biber-darwin_universal.tar \rm biber-darwin_arm* \rm biber-darwin_x86_64* diff --git a/dist/darwin_arm64/build.sh b/dist/darwin_arm64/build.sh index 204b1e43d..85e570df2 100755 --- a/dist/darwin_arm64/build.sh +++ b/dist/darwin_arm64/build.sh @@ -15,20 +15,20 @@ # by looking to see if there is a site_perl directory for the module. If there is, we use that # version. -declare -r perlv='5.36' -declare ucpath="/opt/local/lib/perl5/${perlv}/Unicode/Collate" -export PATH=/opt/local/libexec/perl${perlv}/sitebin:$PATH +declare -r perlv='5.38.0' +declare ucpath="/opt/homebrew/Cellar/perl/${perlv}/lib/perl5/${perlv%.0}/Unicode/Collate" # Unicode::Collate has a site_perl version so has been updated since this # perl was released -if [ -d "/opt/local/lib/perl5/site_perl/${perlv}/darwin-thread-multi-2level/Unicode/Collate" ] + +if [ -d "/opt/homebrew/Cellar/perl/${perlv}/lib/perl5/site_perl/${perlv%.0}/Unicode/Collate" ] then - ucpath="/opt/local/lib/perl5/site_perl/${perlv}/darwin-thread-multi-2level/Unicode/Collate" + ucpath="/opt/homebrew/Cellar/perl/${perlv}/lib/perl5/site_perl/${perlv%.0}/Unicode/Collate" fi echo "USING Unicode::Collate at: ${ucpath}" -cp /opt/local/libexec/perl${perlv}/sitebin/biber /tmp/biber-darwin +cp /opt/homebrew/Cellar/perl/${perlv}/bin/biber /tmp/biber-darwin PAR_VERBATIM=1 pp \ --module=deprecate \ @@ -55,7 +55,7 @@ PAR_VERBATIM=1 pp \ --module=DateTime \ --link=/opt/local/lib/libz.1.dylib \ --link=/opt/local/lib/libiconv.2.dylib \ - --link=/opt/local/libexec/perl${perlv}/sitebin/libbtparse.dylib \ + --link=/opt/homebrew/Cellar/perl/${perlv}/lib/libbtparse.dylib \ --link=/opt/local/lib/libxml2.2.dylib \ --link=/opt/local/lib/libxslt.1.dylib \ --link=/opt/local/lib/libgdbm.6.dylib \ @@ -78,9 +78,9 @@ PAR_VERBATIM=1 pp \ --addfile="${ucpath}/CJK;lib/Unicode/Collate/CJK;lib/Unicode/Collate/CJK" \ --addfile="${ucpath}/allkeys.txt;lib/Unicode/Collate/allkeys.txt" \ --addfile="${ucpath}/keys.txt;lib/Unicode/Collate/keys.txt" \ - --addfile="/opt/local/lib/perl5/site_perl/${perlv}/Mozilla/CA/cacert.pem;lib/Mozilla/CA/cacert.pem" \ - --addfile="/opt/local/lib/perl5/site_perl/${perlv}/Business/ISBN/RangeMessage.xml;lib/Business/ISBN/RangeMessage.xml" \ - --addfile="/opt/local/lib/perl5/site_perl/${perlv}/darwin-thread-multi-2level/auto/Unicode/LineBreak/LineBreak.bundle;lib/auto/Unicode/LineBreak/LineBreak.bundle" \ +--addfile="/opt/homebrew/Cellar/perl/${perlv}/lib/perl5/site_perl/${perlv%.0}/Mozilla/CA/cacert.pem;lib/Mozilla/CA/cacert.pem" \ + --addfile="/opt/homebrew/Cellar/perl/${perlv}/lib/perl5/site_perl/${perlv%.0}/Business/ISBN/RangeMessage.xml;lib/Business/ISBN/RangeMessage.xml" \ + --addfile="/opt/homebrew/Cellar/perl/${perlv}/lib/perl5/site_perl/${perlv%.0}/darwin-thread-multi-2level/auto/Unicode/LineBreak/LineBreak.bundle;lib/auto/Unicode/LineBreak/LineBreak.bundle" \ --cachedeps=scancache \ --output=biber-darwin_arm64 \ /tmp/biber-darwin