[haiku-commits] r39357 - in haiku/trunk: build/jam src/kits/print src/servers/print src/servers/print_addon
- From: michael.w.pfeiffer@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 8 Nov 2010 19:34:43 +0100 (CET)
Author: laplace
Date: 2010-11-08 19:34:43 +0100 (Mon, 08 Nov 2010)
New Revision: 39357
Changeset: http://dev.haiku-os.org/changeset/39357
Added:
haiku/trunk/src/servers/print_addon/print_addon_server.rdef
Removed:
haiku/trunk/src/servers/print_addon/print_server_add_on.rdef
Modified:
haiku/trunk/build/jam/HaikuImage
haiku/trunk/src/kits/print/PrintServerAddOnProtocol.cpp
haiku/trunk/src/servers/print/Printer.cpp
haiku/trunk/src/servers/print_addon/Jamfile
Log:
* On image renamed print_server_add_on to print_addon_server
and moved it from folder bin to servers.
The print_server uses print_addon_server now to
execute printer driver add-ons.
Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage 2010-11-08 17:46:16 UTC (rev 39356)
+++ haiku/trunk/build/jam/HaikuImage 2010-11-08 18:34:43 UTC (rev 39357)
@@ -47,7 +47,7 @@
netcat netstat nl nohup notify nproc
od open
passwd paste patch pathchk pc ping ping6 play playfile playsound playwav
- pr prio printenv printf print_server_add_on profile ps ptx pwd
+ pr prio printenv printf profile ps ptx pwd
query quit
rc readlink ReadOnlyBootPrompt reindex release renice rlog rm rmattr
rmindex rmdir roster route
@@ -100,7 +100,7 @@
;
SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server mail_daemon
media_addon_server media_server midi_server mount_server net_server
- notification_server print_server registrar syslog_daemon
+ notification_server print_server print_addon_server registrar
syslog_daemon
;
SYSTEM_NETWORK_DEVICES = ethernet loopback ;
Modified: haiku/trunk/src/kits/print/PrintServerAddOnProtocol.cpp
===================================================================
--- haiku/trunk/src/kits/print/PrintServerAddOnProtocol.cpp 2010-11-08
17:46:16 UTC (rev 39356)
+++ haiku/trunk/src/kits/print/PrintServerAddOnProtocol.cpp 2010-11-08
18:34:43 UTC (rev 39357)
@@ -1,7 +1,7 @@
#include "PrintServerAddOnProtocol.h"
const char* kPrintServerAddOnApplicationSignature =
- "application/x-vnd.haiku-print-server-add-on";
+ "application/x-vnd.haiku-print-addon-server";
const char* kPrintServerAddOnStatusAttribute = "status";
const char* kPrinterDriverAttribute = "driver";
Modified: haiku/trunk/src/servers/print/Printer.cpp
===================================================================
--- haiku/trunk/src/servers/print/Printer.cpp 2010-11-08 17:46:16 UTC (rev
39356)
+++ haiku/trunk/src/servers/print/Printer.cpp 2010-11-08 18:34:43 UTC (rev
39357)
@@ -10,13 +10,7 @@
#include "BeUtils.h"
#include "pr_server.h"
-// TODO enable when issue launching print_server_add_on is resolved
-#if 0
-# include "PrintServerAddOn.h"
-#else
-# include "PrinterDriverAddOn.h"
-# define PrintServerAddOn PrinterDriverAddOn
-#endif
+#include "PrintServerAddOn.h"
#include "PrintServerApp.h"
// posix
Modified: haiku/trunk/src/servers/print_addon/Jamfile
===================================================================
--- haiku/trunk/src/servers/print_addon/Jamfile 2010-11-08 17:46:16 UTC (rev
39356)
+++ haiku/trunk/src/servers/print_addon/Jamfile 2010-11-08 18:34:43 UTC (rev
39357)
@@ -2,15 +2,15 @@
UsePrivateHeaders shared print ;
-AddResources print_server_add_on :
- print_server_add_on.rdef
+AddResources print_addon_server :
+ print_addon_server.rdef
;
-Application print_server_add_on :
+Application print_addon_server :
PrintServerAddOnApplication.cpp
;
-LinkAgainst print_server_add_on :
+LinkAgainst print_addon_server :
be
root
libprintutils.a
Copied: haiku/trunk/src/servers/print_addon/print_addon_server.rdef (from rev
39356, haiku/trunk/src/servers/print_addon/print_server_add_on.rdef)
===================================================================
--- haiku/trunk/src/servers/print_addon/print_addon_server.rdef
(rev 0)
+++ haiku/trunk/src/servers/print_addon/print_addon_server.rdef 2010-11-08
18:34:43 UTC (rev 39357)
@@ -0,0 +1,65 @@
+
+resource app_signature "application/x-vnd.haiku-print-addon-server";
+
+resource app_version {
+ major = 1,
+ middle = 0,
+ minor = 0,
+
+ variety = B_APPV_ALPHA,
+ internal = 0,
+
+ short_info = "print_addon_server",
+ long_info = "print_addon_server ©2010 Haiku"
+};
+
+resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP;
+
+resource vector_icon {
+ $"6E636966160500020016023A3D24339506B715A93DDB134A79084A1A1100D7FF"
+ $"B80594020016023A3D24339506B715A93DDB134A79084A1A1100D2FF8505C402"
+ $"0016023A692E36692FBA2ECD3E2ECC4B89A4496318005CFF83020016023C8000"
+ $"0000000000003C00004AC00049000000F4FFDB03A9FF00020106033C00000000"
+ $"000000003C00004680004680000B9EEDFF2567CEFFFF0473B3020106033C0000"
+ $"0000000000003C000046800046800000B9FF97BE05D65EFF04994304016E0500"
+ $"02001602B76E71BBF8593D1210B8A7674742A04ABEFB00AEFFE1053802001603"
+ $"373333B9333339333337333348E54F4B555400FFBFE5FF9B0200160336C6F3B9"
+ $"284239E397376BB94A71BE484A25005346B5FFFF02001602B500003A6000BA60"
+ $"00B500004A2E244AB9D001C0FF9A020116023AA41339C70ABC27003D026E4ACA"
+ $"B74AC8AB0183FFAD020106023600000000000000003700004A10004AB0000035"
+ $"FF06FB1E9303020106023600000000000000003700004A10004AB00000FFE3E3"
+ $"FFDD05050101000073020116023E1E41BC9E393B21B93C88A64824E3485D8500"
+ $"90FF3C150A044C60516060505C4E0A0651365A395A504C5E425842400A084C44"
+ $"4C5EC3AECB26C3AEC72A4450C159C9CB425842400A04C1EFC6634450C159C9CB"
+ $"C1DDCA180A04C317C6E8C1EFC663C1DDCA18C315CACE0A04C3AECB26C3AEC72A"
+ $"C317C6E8C315CACE0A0451365A394C4442400A044C445A395A504C5E0A044846"
+ $"48484AC3234AC2570404BE404A3246324A323E4236423C423237320606BE023A"
+ $"5F485C46584C5E5656525A5656604C58483A0608EFB6302E302E25372248223A"
+ $"2248465A4A59485B4A59584B41573E583F563D543C0608AAFF503A4E3C323134"
+ $"2F302E302E25372248223A2248465A465A464C543C4A46543C0205573E583F56"
+ $"3D543C543C4A46465A464C465A4A59485B4A4F5841523F584106033B4A594A4F"
+ $"4A59584B58415841523F0A04264842564252264406057A0322513A5E42543C58"
+ $"425452B77BC261B77BC261254A0802285038580A06542A3C22353135324C3B4C"
+ $"3A0202404A3E4C4248434D454B414F020332332B3332334B3E4B3E453E354744"
+ $"4E26401B0A0A0109124000000000000000003FB6DB4200004324920117840004"
+ $"0A0001091001178400040A0A0100023F48D60000000000003F48D6C928D6C7DD"
+ $"690A000101123F48D60000000000003F48D6C938D6C7E56901178500040A0101"
+ $"02023F48D60000000000003F48D6C938D6C7E5690A020103023F48D600000000"
+ $"00003F48D6C938D6C7E5690A030104023F48D60000000000003F48D6C938D6C7"
+ $"E5690A040105023F48D60000000000003F48D6C938D6C7E5690A060106023F48"
+ $"D60000000000003F48D6C938D6C7E5690A050107023F48D60000000000003F48"
+ $"D6C938D6C7E5690A030108123F48D60000000000003F48D6C938D6C7E5690117"
+ $"8100040A070108023F48D60000000000003F48D6C938D6C7E5690A14010A023E"
+ $"932D0000000000003E932D48D9A548A3D70A0B030B1012123E932D0000000000"
+ $"003E932D48D9A548A3D701178600040A0C010C023E932D0000000000003E932D"
+ $"48D9A548A3D70A0B010F123E932D0000000000003E932D48D9A548A3D7011782"
+ $"00040A0D010F023E932D0000000000003E932D48D9A548A3D70A0E0110023E93"
+ $"2D0000000000003E932D48D9A548A3D70A0F0112023E932D0000000000003E93"
+ $"2D48D9A548A3D70A10010D023E932D0000000000003E932D48D9A548A3D70A11"
+ $"010E023E932D0000000000003E932D48D9A548A3D70A130113023E932D000000"
+ $"0000003E932D4940A54851710A120113023E932D0000000000003E932D4902D8"
+ $"48B8700A0B0111123E932D0000000000003E932D492C0B48517101178100040A"
+ $"0B0111123E932D0000000000003E932D4902D8487AA401178100040A0B01111A"
+ $"3E932D0000000000003E932D48D9A548A3D715FF01178100040A150114023E93"
+ $"2D0000000000003E932D48D9A548A3D7"
+};
Other related posts:
- » [haiku-commits] r39357 - in haiku/trunk: build/jam src/kits/print src/servers/print src/servers/print_addon - michael . w . pfeiffer
