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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Jul  6 14:49:59 2009
New Revision: 4308

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4308
Log:
add a --no-class argument so that the Info.plist does not define a Class
driver. Default is class driver.

Modified:
    trunk/Drivers/ccid/src/Info.plist.src
    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=4308&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/Info.plist.src (original)
+++ trunk/Drivers/ccid/src/Info.plist.src Mon Jul  6 14:49:59 2009
@@ -10,6 +10,7 @@
 	<string>org.debian.alioth.pcsclite.smartcardccid</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	MAGIC_CLASS
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>

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=4308&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/create_Info_plist.pl (original)
+++ trunk/Drivers/ccid/src/create_Info_plist.pl Mon Jul  6 14:49:59 2009
@@ -30,11 +30,17 @@
 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;
 
 GetOptions("ifdCapabilities=s" => \$ifdCapabilities,
 	"target=s" => \$target,
 	"version=s" => \$version,
-	"bundle=s" => \$bundle);
+	"bundle=s" => \$bundle,
+	"no-class" => \$noclass);
+
+print "$class";
 
 if ($#ARGV < 1)
 {
@@ -45,8 +51,6 @@
 	--bundle=$bundle\n";
 	exit;
 }
-
-print "$ifdCapabilities";
 
 open IN, "< $ARGV[0]" or die "Can't open $ARGV[0]: $!";
 while (<IN>)
@@ -110,6 +114,14 @@
 		print;
 		next;
 	}
+	if (m/MAGIC_CLASS/)
+	{
+		next if ($noclass);
+
+		s/MAGIC_CLASS/$class/;
+		print;
+		next;
+	}
 	print;
 }