From b08d33ceb67e6607f632026417581ba443c4615a Mon Sep 17 00:00:00 2001
From: Frank Morgner <frankmorgner@gmail.com>
Date: Tue, 14 Apr 2020 18:18:26 +0200
Subject: [PATCH] Travis: seperate installer packages not needed anymore

---
 .github/push_artifacts.sh       |  2 +-
 .travis.yml                     |  2 -
 MacOSX/Makefile.am              |  2 +-
 MacOSX/build-package-from-ci.in | 80 ---------------------------------
 configure.ac                    |  1 -
 5 files changed, 2 insertions(+), 85 deletions(-)
 delete mode 100755 MacOSX/build-package-from-ci.in

diff --git a/.github/push_artifacts.sh b/.github/push_artifacts.sh
index 15d07868..4b7f5d9a 100755
--- a/.github/push_artifacts.sh
+++ b/.github/push_artifacts.sh
@@ -9,7 +9,7 @@ git clone --single-branch https://${GH_TOKEN}@github.com/OpenSC/Nightly.git > /d
 cd Nightly
 git checkout -b "${BRANCH}"
 
-for file in ${BUILDPATH}/win32/Output/OpenSC*.exe ${BUILDPATH}/opensc*.tar.gz ${BUILDPATH}/OpenSC*.dmg ${BUILDPATH}/OpenSC*.msi ${BUILDPATH}/OpenSC*.zip ${BUILDPATH}/*.pkg
+for file in ${BUILDPATH}/win32/Output/OpenSC*.exe ${BUILDPATH}/opensc*.tar.gz ${BUILDPATH}/OpenSC*.dmg ${BUILDPATH}/OpenSC*.msi ${BUILDPATH}/OpenSC*.zip
 do
     if [ -f ${file} ]
     then
diff --git a/.travis.yml b/.travis.yml
index 873fb530..0256e837 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -328,8 +328,6 @@ cache:
   directories:
     - $HOME/.m2/
     - $HOME/Library/Caches/Homebrew
-    - openssl
-    - openpace
     - openssl_bin
     - openpace_bin
     - isetup
diff --git a/MacOSX/Makefile.am b/MacOSX/Makefile.am
index 4d032aee..b0fa2130 100644
--- a/MacOSX/Makefile.am
+++ b/MacOSX/Makefile.am
@@ -1,5 +1,5 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-EXTRA_DIST = build build-package.in build-package-from-ci.in Distribution.xml.in libtool-bundle opensc-uninstall \
+EXTRA_DIST = build build-package.in Distribution.xml.in libtool-bundle opensc-uninstall \
 	resources \
 	resources/background.jpg \
 	resources/Welcome.html.in \
diff --git a/MacOSX/build-package-from-ci.in b/MacOSX/build-package-from-ci.in
deleted file mode 100755
index 24e626bb..00000000
--- a/MacOSX/build-package-from-ci.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-# temporary build script until we've fixed the CI to include CTK
-
-# You need to install the following packages from homebrew or macports or fink:
-# autoconf automake libtool pkg-config help2man gengetopt
-
-export MACOSX_DEPLOYMENT_TARGET="10.10"
-
-set -ex
-test -x ./configure || ./bootstrap
-BUILDPATH=${PWD}
-
-# Locate the latest OSX SDK
-SDK_PATH=$(xcrun --sdk macosx --show-sdk-path)
-
-# Set SDK path
-export CFLAGS="$CFLAGS -isysroot $SDK_PATH -arch x86_64"
-
-# Build OpenSCToken
-if ! test -e OpenSCToken; then
-    git clone --depth=1 https://github.com/frankmorgner/OpenSCToken.git
-fi
-cd OpenSCToken
-# make sure OpenSCToken builds with the same dependencies as before
-if ! test -e OpenSC; then
-    git clone --depth=1 ../../OpenSC
-else
-    cd OpenSC && git pull && cd ..
-fi
-if ! test -e openssl; then
-    git clone --depth=1 https://github.com/openssl/openssl.git -b OpenSSL_1_0_2-stable
-else
-    cd openssl && git pull && cd ..
-fi
-if ! test -e openpace; then
-    git clone --depth=1 https://github.com/frankmorgner/openpace.git -b 1.1.0
-else
-    cd openpace && git pull && cd ..
-fi
-BP=${BUILDPATH}
-. ./bootstrap
-BUILDPATH=${BP}
-xcodebuild -target OpenSCTokenApp -configuration Debug -project OpenSCTokenApp.xcodeproj install DSTROOT=${BUILDPATH}/target_token
-cd ..
-
-imagedir=$(mktemp -d)
-
-# Get name of branch in Nightly which corresponds to the latest commit in OpenSC
-BRANCH=`git log --max-count=1 --date=short --abbrev=8 --pretty=format:"%cd_%h"`
-if ! test -e Nightly-${BRANCH}; then
-    # Download the build
-    curl -L https://github.com/OpenSC/Nightly/archive/${BRANCH}.zip > ${BRANCH}.zip
-    # Unpack the build
-    unzip ${BRANCH}.zip
-fi
-cp Nightly-${BRANCH}/OpenSC-startup.pkg .
-cp Nightly-${BRANCH}/OpenSC-tokend.pkg .
-cp Nightly-${BRANCH}/OpenSC.pkg .
-
-# Build package
-pkgbuild --root ${BUILDPATH}/target_token --identifier org.opensc-project.mac.opensctoken --version @PACKAGE_VERSION@ --install-location / OpenSCToken.pkg
-
-# Build product
-productbuild --distribution MacOSX/Distribution.xml --package-path . --resources MacOSX/resources "${imagedir}/OpenSC @PACKAGE_VERSION@.pkg"
-
-# Build "Uninstaller"
-osacompile -o "${imagedir}/OpenSC Uninstaller.app" "MacOSX/OpenSC_Uninstaller.applescript"
-
-# Create .dmg
-rm -f OpenSC-@PACKAGE_VERSION@.dmg
-i=0
-while ! hdiutil create -srcfolder "${imagedir}" -volname "@PACKAGE_NAME@" -fs JHFS+ OpenSC-@PACKAGE_VERSION@.dmg
-do
-	i=$[$i+1]
-	if [ $i -gt 2 ]
-	then
-		exit 1
-	fi
-done
-rm -rf ${imagedir}
diff --git a/configure.ac b/configure.ac
index 61f24633..b1bf2965 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1118,7 +1118,6 @@ AC_CONFIG_FILES([
 	win32/OpenSC.wxs
 	MacOSX/Makefile
 	MacOSX/build-package
-	MacOSX/build-package-from-ci
 	MacOSX/Distribution.xml
 	MacOSX/resources/Welcome.html
 ])