[Pcsclite-cvs-commit] r6518 - in /trunk/Drivers/ccid/src: Info.plist.src Makefile.am create_Info_plist.pl

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Sun Jan 27 11:21:24 UTC 2013


Author: rousseau
Date: Sun Jan 27 11:21:23 2013
New Revision: 6518

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6518
Log:
Remove the duplicate CFBundleExecutable from Info.plist

CFBundleExecutable key was used 2 times:
- The first occurence stored the bundle name (ifd-ccid.bundle)
- The second occurence stored the executable name (libccid.so or .dylib)

The bundle name is not usefull and has been present since revision 3458
(April 2009)

Modified:
    trunk/Drivers/ccid/src/Info.plist.src
    trunk/Drivers/ccid/src/Makefile.am
    trunk/Drivers/ccid/src/create_Info_plist.pl

Modified: trunk/Drivers/ccid/src/Info.plist.src
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/Info.plist.src?rev=6518&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/Info.plist.src (original)
+++ trunk/Drivers/ccid/src/Info.plist.src Sun Jan 27 11:21:23 2013
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>MAGIC_BUNDLE</string>
+	<string>MAGIC_TARGET</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.debian.alioth.pcsclite.smartcardccid</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -92,9 +92,6 @@
 	Default value: 0
 	-->
 
-	<key>CFBundleExecutable</key>
-	<string>MAGIC_TARGET</string>
-
 	<key>ifdManufacturerString</key>
 	<string>Ludovic Rousseau (ludovic.rousseau at free.fr)</string>
 

Modified: trunk/Drivers/ccid/src/Makefile.am
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/Makefile.am?rev=6518&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/Makefile.am (original)
+++ trunk/Drivers/ccid/src/Makefile.am Sun Jan 27 11:21:23 2013
@@ -78,7 +78,7 @@
 INSTALL_UDEV_RULE_FILE=@/bin/echo -e "\n\33[01;31m***************\n" ; echo "copy the src/92_pcscd_ccid.rules file in udev directory (/etc/udev/rules.d/)" ; /bin/echo -e "\n***************\n\33[0m"
 
 Info.plist: Info.plist.src $(srcdir)/../readers/supported_readers.txt
-	$(srcdir)/create_Info_plist.pl $(srcdir)/../readers/supported_readers.txt $(srcdir)/Info.plist.src --target=$(CCID_LIB) --version=$(VERSION) --bundle=$(CCID_BUNDLE) $(NOCLASS) > Info.plist
+	$(srcdir)/create_Info_plist.pl $(srcdir)/../readers/supported_readers.txt $(srcdir)/Info.plist.src --target=$(CCID_LIB) --version=$(VERSION) $(NOCLASS) > Info.plist
 
 DISTCLEANFILES = tokenparser.c Info.plist
 

Modified: trunk/Drivers/ccid/src/create_Info_plist.pl
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/create_Info_plist.pl?rev=6518&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/create_Info_plist.pl (original)
+++ trunk/Drivers/ccid/src/create_Info_plist.pl Sun Jan 27 11:21:23 2013
@@ -28,7 +28,6 @@
 my ($manuf, $product, $name);
 my $target = "libccid.so";
 my $version = "1.0.0";
-my $bundle = "ifd-ccid.bundle";
 my $class = "<key>CFBundleName</key>
 	<string>CCIDCLASSDRIVER</string>";
 my $noclass = 0;
@@ -36,7 +35,6 @@
 GetOptions(
 	"target=s" => \$target,
 	"version=s" => \$version,
-	"bundle=s" => \$bundle,
 	"no-class" => \$noclass);
 
 if ($#ARGV < 1)
@@ -44,7 +42,6 @@
 	print "usage: $0 supported_readers.txt Info.plist
 	--target=$target
 	--version=$version
-	--bundle=$bundle\n";
 	exit;
 }
 
@@ -99,12 +96,6 @@
 		print;
 		next;
 	}
-	if (m/MAGIC_BUNDLE/)
-	{
-		s/MAGIC_BUNDLE/$bundle/;
-		print;
-		next;
-	}
 	if (m/MAGIC_CLASS/)
 	{
 		next if ($noclass);




More information about the Pcsclite-cvs-commit mailing list