[Pcsclite-cvs-commit] r289 - in /trunk: AuthICPlugin/installBundle CFlexPlugin/installBundle MCardPlugin/installBundle MCardPluginDDK/installBundle

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Wed Jun 24 09:10:17 UTC 2009


Author: rousseau
Date: Wed Jun 24 09:10:16 2009
New Revision: 289

URL: http://svn.debian.org/wsvn/muscleplugins/?sc=1&rev=289
Log:
use the same script for all projects

Modified:
    trunk/AuthICPlugin/installBundle
    trunk/CFlexPlugin/installBundle
    trunk/MCardPlugin/installBundle
    trunk/MCardPluginDDK/installBundle

Modified: trunk/AuthICPlugin/installBundle
URL: http://svn.debian.org/wsvn/muscleplugins/trunk/AuthICPlugin/installBundle?rev=289&op=diff
==============================================================================
--- trunk/AuthICPlugin/installBundle (original)
+++ trunk/AuthICPlugin/installBundle Wed Jun 24 09:10:16 2009
@@ -1,32 +1,48 @@
+#!/bin/sh
+
 # bundleTool
 # David Corcoran <corcoran at linuxnet.com>
 # MUSCLE <http://www.musclecard.com>
 #
 
-#!/bin/sh
+if [ x$DESTDIR = "x" ]
+then
+	DESTDIR=`pkg-config libmusclecard --variable=muscledropdir`
+	DESTDIR=${DESTDIR:-/usr/local/pcsc/services}
+fi
 
 bundlename="authentIC.bundle"
-libname="libauthentIC.so"
+libname="libauthentIC"
 targetname="authentIC"
+dso_suffix="so"
 
 hostType=`uname`
 echo "Determining system type "
 vFlag=0
 
 case "$hostType" in
-	SunOS) 		vFlag=1 
-			hostType="Solaris";;
-	Linux) 		vFlag=1
-			hostType="Linux";;
-	Darwin) 	vFlag=1
-			hostType="MacOS";;
-	BSD) 		vFlag=1
-			hostType="BSD";;
-	HPUX) 		vFlag=1
-			hostType="HPUX";;
-	Tru64) 		vFlag=1
-			hostType="Tru64";;
-	*)		vFlag=0;;
+	SunOS)
+		vFlag=1 
+		hostType="Solaris";;
+	Linux)
+		vFlag=1
+		hostType="Linux";;
+	Darwin)
+		vFlag=1
+		dso_suffix="dylib"
+		hostType="MacOS";;
+	*BSD*)
+		vFlag=1
+		hostType="BSD";;
+	HPUX)
+		vFlag=1
+		dso_suffix="sl"
+		hostType="HPUX";;
+	Tru64)
+		vFlag=1
+		hostType="Tru64";;
+	*)
+		vFlag=0;;
 esac
 
 if [ "$vFlag" = 1 ] 
@@ -65,11 +81,12 @@
 	esac
 fi
 
-echo "Writing service bundle"
-mkdir -p /usr/local/pcsc/services
-chmod 755 /usr/local/pcsc/services 
-cp -r src/$bundlename /usr/local/pcsc/services
-mkdir -p /usr/local/pcsc/services/$bundlename/Contents/$hostType
-chmod 755 /usr/local/pcsc/services/$bundlename/Contents/$hostType
-cp src/.libs/$libname /usr/local/pcsc/services/$bundlename/Contents/$hostType/$targetname
-echo "Installation Successful"
+echo "Writing service bundle for $targetname in $DESTDIR"
+if [ ! -d $DESTDIR ]
+then
+	install -d -m 755 $DESTDIR
+fi
+cp -r src/$bundlename $DESTDIR
+install -d -m 755 $DESTDIR/$bundlename/Contents/$hostType
+install -m 644 src/.libs/$libname.$dso_suffix $DESTDIR/$bundlename/Contents/$hostType/$targetname
+echo "Installation successful"

Modified: trunk/CFlexPlugin/installBundle
URL: http://svn.debian.org/wsvn/muscleplugins/trunk/CFlexPlugin/installBundle?rev=289&op=diff
==============================================================================
--- trunk/CFlexPlugin/installBundle (original)
+++ trunk/CFlexPlugin/installBundle Wed Jun 24 09:10:16 2009
@@ -13,28 +13,36 @@
 
 bundlename="slbCryptoflex.bundle"
 libname="libcryptoflex"
+targetname="slbCryptoflex"
 dso_suffix="so"
-targetname="slbCryptoflex"
 
 hostType=`uname`
 echo "Determining system type "
 vFlag=0
 
 case "$hostType" in
-	SunOS) 		vFlag=1 
-			hostType="Solaris";;
-	Linux) 		vFlag=1
-			hostType="Linux";;
-	Darwin) 	vFlag=1
-			hostType="MacOS";;
-	*BSD*) 		vFlag=1
-			hostType="BSD";;
-	HPUX) 		vFlag=1
-			dso_suffix="sl"
-			hostType="HPUX";;
-	Tru64) 		vFlag=1
-			hostType="Tru64";;
-	*)		vFlag=0;;
+	SunOS)
+		vFlag=1 
+		hostType="Solaris";;
+	Linux)
+		vFlag=1
+		hostType="Linux";;
+	Darwin)
+		vFlag=1
+		dso_suffix="dylib"
+		hostType="MacOS";;
+	*BSD*)
+		vFlag=1
+		hostType="BSD";;
+	HPUX)
+		vFlag=1
+		dso_suffix="sl"
+		hostType="HPUX";;
+	Tru64)
+		vFlag=1
+		hostType="Tru64";;
+	*)
+		vFlag=0;;
 esac
 
 if [ "$vFlag" = 1 ] 
@@ -66,8 +74,7 @@
 		Linux) 		echo "Linux";;
 		MacOS) 		echo "MacOS";;
 		BSD) 		echo "BSD";;
-		HPUX) 		dso_suffix="sl"
-				echo "HPUX";;
+		HPUX) 		echo "HPUX";;
 		Tru64) 		echo "Tru64";;
 		*)		echo "Invalid OS Choice"
 				exit 1;;
@@ -82,5 +89,4 @@
 cp -r src/$bundlename $DESTDIR
 install -d -m 755 $DESTDIR/$bundlename/Contents/$hostType
 install -m 644 src/.libs/$libname.$dso_suffix $DESTDIR/$bundlename/Contents/$hostType/$targetname
-echo "Installation Successful"
-
+echo "Installation successful"

Modified: trunk/MCardPlugin/installBundle
URL: http://svn.debian.org/wsvn/muscleplugins/trunk/MCardPlugin/installBundle?rev=289&op=diff
==============================================================================
--- trunk/MCardPlugin/installBundle (original)
+++ trunk/MCardPlugin/installBundle Wed Jun 24 09:10:16 2009
@@ -13,31 +13,73 @@
 
 bundlename="mscMuscleCard.bundle"
 libname="libmusclecardApplet"
+targetname="mscMuscleCard"
 dso_suffix="so"
-targetname="mscMuscleCard"
 
 hostType=`uname`
+echo "Determining system type "
+vFlag=0
 
 case "$hostType" in
 	SunOS)
+		vFlag=1 
 		hostType="Solaris";;
 	Linux)
+		vFlag=1
 		hostType="Linux";;
 	Darwin)
+		vFlag=1
 		dso_suffix="dylib"
 		hostType="MacOS";;
-	BSD)
+	*BSD*)
+		vFlag=1
 		hostType="BSD";;
 	HPUX)
+		vFlag=1
 		dso_suffix="sl"
 		hostType="HPUX";;
 	Tru64)
+		vFlag=1
 		hostType="Tru64";;
 	*)
-		echo "Couldn't determine system type: $hostType"
-		exit;;
+		vFlag=0;;
 esac
-echo "Configuring for system: $hostType"
+
+if [ "$vFlag" = 1 ] 
+then
+	echo "Configuring for system: $hostType"
+else
+	echo "Couldn't determine system type"
+
+	echo "Which of the following are you using ?"
+	echo "	Linux"
+	echo "	Solaris"
+	echo "	Tru64"
+	echo "	MacOS"
+	echo "	HPUX"
+	echo "	BSD"
+
+	echo "Enter the value: "
+
+	if read hostType
+	then
+		echo "Operating System"
+	else
+		echo "terminating"                                     
+   	exit 0                                       
+	fi
+
+	case "$hostType" in
+		Solaris) 	echo "Solaris";;
+		Linux) 		echo "Linux";;
+		MacOS) 		echo "MacOS";;
+		BSD) 		echo "BSD";;
+		HPUX) 		echo "HPUX";;
+		Tru64) 		echo "Tru64";;
+		*)		echo "Invalid OS Choice"
+				exit 1;;
+	esac
+fi
 
 echo "Writing service bundle for $targetname in $DESTDIR"
 if [ ! -d $DESTDIR ]
@@ -49,5 +91,4 @@
 cp -r src/$bundlename $DESTDIR
 install -d -m 755 $DESTDIR/$bundlename/Contents/$hostType
 install -m 644 src/.libs/$libname.$dso_suffix $DESTDIR/$bundlename/Contents/$hostType/$targetname
-echo "Installation Successful"
-
+echo "Installation successful"

Modified: trunk/MCardPluginDDK/installBundle
URL: http://svn.debian.org/wsvn/muscleplugins/trunk/MCardPluginDDK/installBundle?rev=289&op=diff
==============================================================================
--- trunk/MCardPluginDDK/installBundle (original)
+++ trunk/MCardPluginDDK/installBundle Wed Jun 24 09:10:16 2009
@@ -1,32 +1,48 @@
+#!/bin/sh
+
 # bundleTool
 # David Corcoran <corcoran at linuxnet.com>
 # MUSCLE <http://www.musclecard.com>
 #
 
-#!/bin/sh
+if [ x$DESTDIR = "x" ]
+then
+	DESTDIR=`pkg-config libmusclecard --variable=muscledropdir`
+	DESTDIR=${DESTDIR:-/usr/local/pcsc/services}
+fi
 
 bundlename="genericPlugin.bundle"
-libname="genericPlugin.so"
+libname="genericPlugin"
 targetname="genericPlugin"
+dso_suffix="so"
 
 hostType=`uname`
 echo "Determining system type "
 vFlag=0
 
 case "$hostType" in
-	SunOS) 		vFlag=1 
-			hostType="Solaris";;
-	Linux) 		vFlag=1
-			hostType="Linux";;
-	Darwin) 	vFlag=1
-			hostType="MacOS";;
-	BSD) 		vFlag=1
-			hostType="BSD";;
-	HPUX) 		vFlag=1
-			hostType="HPUX";;
-	Tru64) 		vFlag=1
-			hostType="Tru64";;
-	*)		vFlag=0;;
+	SunOS)
+		vFlag=1 
+		hostType="Solaris";;
+	Linux)
+		vFlag=1
+		hostType="Linux";;
+	Darwin)
+		vFlag=1
+		dso_suffix="dylib"
+		hostType="MacOS";;
+	*BSD*)
+		vFlag=1
+		hostType="BSD";;
+	HPUX)
+		vFlag=1
+		dso_suffix="sl"
+		hostType="HPUX";;
+	Tru64)
+		vFlag=1
+		hostType="Tru64";;
+	*)
+		vFlag=0;;
 esac
 
 if [ "$vFlag" = 1 ] 
@@ -65,11 +81,12 @@
 	esac
 fi
 
-echo "Writing service bundle"
-mkdir -p /usr/local/pcsc/services
-chmod 755 /usr/local/pcsc/services 
-cp -r src/$bundlename /usr/local/pcsc/services
-mkdir -p /usr/local/pcsc/services/$bundlename/Contents/$hostType
-chmod 755 /usr/local/pcsc/services/$bundlename/Contents/$hostType
-cp src/.libs/$libname /usr/local/pcsc/services/$bundlename/Contents/$hostType/$targetname
-echo "Installation Successful"
+echo "Writing service bundle for $targetname in $DESTDIR"
+if [ ! -d $DESTDIR ]
+then
+	install -d -m 755 $DESTDIR
+fi
+cp -r src/$bundlename $DESTDIR
+install -d -m 755 $DESTDIR/$bundlename/Contents/$hostType
+install -m 644 src/.libs/$libname.$dso_suffix $DESTDIR/$bundlename/Contents/$hostType/$targetname
+echo "Installation successful"




More information about the Pcsclite-cvs-commit mailing list