[haiku-commits] r41856 - in haiku/branches/releases/r1alpha3: . build/jam headers/libs/freetype2 headers/libs/png headers/libs/tiff ...
- From: pulkomandy@xxxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 31 May 2011 23:10:06 +0200 (CEST)
Author: pulkomandy
Date: 2011-05-31 23:10:06 +0200 (Tue, 31 May 2011)
New Revision: 41856
Changeset: https://dev.haiku-os.org/changeset/41856
Modified:
haiku/branches/releases/r1alpha3/
haiku/branches/releases/r1alpha3/build/jam/
haiku/branches/releases/r1alpha3/build/jam/OptionalPackages
haiku/branches/releases/r1alpha3/headers/libs/freetype2/
haiku/branches/releases/r1alpha3/headers/libs/png/png.h
haiku/branches/releases/r1alpha3/headers/libs/png/pngconf.h
haiku/branches/releases/r1alpha3/headers/libs/tiff/tiff.h
haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffio.h
haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffvers.h
haiku/branches/releases/r1alpha3/src/add-ons/kernel/bus_managers/acpi/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/
haiku/branches/releases/r1alpha3/src/add-ons/media/plugins/ffmpeg/
haiku/branches/releases/r1alpha3/src/apps/installer/InstallerWindow.cpp
haiku/branches/releases/r1alpha3/src/apps/installer/InstallerWindow.h
haiku/branches/releases/r1alpha3/src/build/libbe/storage/mime/
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h
haiku/branches/releases/r1alpha3/src/libs/freetype2/
haiku/branches/releases/r1alpha3/src/libs/png/
haiku/branches/releases/r1alpha3/src/libs/tiff/
Log:
Merge 41837-41855
Property changes on: haiku/branches/releases/r1alpha3
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals:40148-40195
/haiku/branches/developer/bonefish/weak-symbols:39365-39568
/haiku/trunk:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
+ /haiku/branches/developer/bonefish/signals:40148-40195
/haiku/branches/developer/bonefish/weak-symbols:39365-39568
/haiku/trunk:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
Property changes on: haiku/branches/releases/r1alpha3/build/jam
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals/build/jam:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/build/jam:39365-39568
/haiku/trunk/build/jam:41551,41558-41559,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
+ /haiku/branches/developer/bonefish/signals/build/jam:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/build/jam:39365-39568
/haiku/trunk/build/jam:41551,41558-41559,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
Modified: haiku/branches/releases/r1alpha3/build/jam/OptionalPackages
===================================================================
--- haiku/branches/releases/r1alpha3/build/jam/OptionalPackages 2011-05-31
19:37:45 UTC (rev 41855)
+++ haiku/branches/releases/r1alpha3/build/jam/OptionalPackages 2011-05-31
21:10:06 UTC (rev 41856)
@@ -264,17 +264,10 @@
Echo "No optional package BePDF available for gcc4" ;
} else {
InstallOptionalHaikuImagePackage
- bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-28.zip
- : $(baseURL)/bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-28.zip
- : apps ;
+ bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip
+ : $(baseURL)/bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BePDF/BePDF ;
- AddSymlinkToHaikuImage common data licenses
- : "/boot/apps/BePDF/license/locale DevKit/Open Tracker
License"
- : "Open Tracker" ;
- AddSymlinkToHaikuImage common data licenses
- : "/boot/apps/BePDF/license/locale DevKit/LICENSE"
- : "48HRS Public License" ;
}
}
@@ -1439,8 +1432,8 @@
: $(baseURL)/ruby-1.9.1-r1a3-x86-gcc4-2011-05-24.zip ;
} else {
InstallOptionalHaikuImagePackage
- ruby-1.9.1-x86-gcc2-2010-05-20.zip
- : $(baseURL)/ruby-1.9.1-x86-gcc2-2010-05-20.zip ;
+ ruby-1.9.1-r1a3-x86-gcc2-2011-05-31.zip
+ : $(baseURL)/ruby-1.9.1-r1a3-x86-gcc2-2011-05-31.zip ;
}
}
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/freetype2
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/freetype2:40148-40195
/haiku/trunk/headers/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freetype2/2.4.4/include:40532
/haiku/vendor/freetype2/current/include:37946-40531
+
/haiku/branches/developer/bonefish/signals/headers/libs/freetype2:40148-40195
/haiku/trunk/headers/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freetype2/2.4.4/include:40532
/haiku/vendor/freetype2/current/include:37946-40531
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/png/png.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/png/png.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/png.h:39365-39568
/haiku/trunk/headers/libs/png/png.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/libpng/1.4.4/png.h:39522
/haiku/vendor/libpng/current/png.h:35840-39521
+
/haiku/branches/developer/bonefish/signals/headers/libs/png/png.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/png.h:39365-39568
/haiku/trunk/headers/libs/png/png.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/libpng/1.4.4/png.h:39522
/haiku/vendor/libpng/current/png.h:35840-39521
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/png/pngconf.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/png/pngconf.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/pngconf.h:39365-39568
/haiku/trunk/headers/libs/png/pngconf.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/libpng/1.4.4/pngconf.h:39522
/haiku/vendor/libpng/current/pngconf.h:35840-39521
+
/haiku/branches/developer/bonefish/signals/headers/libs/png/pngconf.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/pngconf.h:39365-39568
/haiku/trunk/headers/libs/png/pngconf.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/libpng/1.4.4/pngconf.h:39522
/haiku/vendor/libpng/current/pngconf.h:35840-39521
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/tiff/tiff.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiff.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiff.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiff.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/libtiff/3.9.4/libtiff/tiff.h:38702
/haiku/vendor/libtiff/current/libtiff/tiff.h:38700-38701
+
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiff.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiff.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiff.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/libtiff/3.9.4/libtiff/tiff.h:38702
/haiku/vendor/libtiff/current/libtiff/tiff.h:38700-38701
Property changes on: haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffio.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffio.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffio.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiffio.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/libtiff/3.9.4/libtiff/tiffio.h:38702
/haiku/vendor/libtiff/current/libtiff/tiffio.h:38700-38701
+
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffio.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffio.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiffio.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/libtiff/3.9.4/libtiff/tiffio.h:38702
/haiku/vendor/libtiff/current/libtiff/tiffio.h:38700-38701
Property changes on:
haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffvers.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffvers.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffvers.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiffvers.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/libtiff/3.9.4/libtiff/tiffvers.h:38702
/haiku/vendor/libtiff/current/libtiff/tiffvers.h:38700-38701
+
/haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffvers.h:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffvers.h:39365-39568
/haiku/trunk/headers/libs/tiff/tiffvers.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/libtiff/3.9.4/libtiff/tiffvers.h:38702
/haiku/vendor/libtiff/current/libtiff/tiffvers.h:38700-38701
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/bus_managers/acpi
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/src/add-ons/kernel/bus_managers/acpi:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/bus_managers/acpi:39365-39568
/haiku/trunk/src/add-ons/kernel/bus_managers/acpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/acpica/current:33139-36866
+
/haiku/branches/developer/bonefish/signals/src/add-ons/kernel/bus_managers/acpi:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/bus_managers/acpi:39365-39568
/haiku/trunk/src/add-ons/kernel/bus_managers/acpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/acpica/current:33139-36866
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/an:41235
/haiku/vendor/freebsd/current/dev/an:34496-41234
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/an:41235
/haiku/vendor/freebsd/current/dev/an:34496-41234
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:39365-39568
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freebsd/HEAD/dev/ath/r204100:35677-35713
/haiku/vendor/freebsd/current/dev/ath:34314-35676
+
/haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:39365-39568
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freebsd/HEAD/dev/ath/r204100:35677-35713
/haiku/vendor/freebsd/current/dev/ath:34314-35676
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/bwi:41230-41235
/haiku/vendor/freebsd/current/dev/bwi:34314-41229
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/bwi:41230-41235
/haiku/vendor/freebsd/current/dev/bwi:34314-41229
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwi:41234-41235
/haiku/vendor/freebsd/current/dev/iwi:34314-41233
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwi:41234-41235
/haiku/vendor/freebsd/current/dev/iwi:34314-41233
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/wpi:41231-41235
/haiku/vendor/freebsd/current/dev/wpi:34314-41230
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/wpi:41231-41235
/haiku/vendor/freebsd/current/dev/wpi:34314-41230
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:39365-39568
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwn:41229-41235
/haiku/vendor/freebsd/current/dev/iwn:34314-41228
+
/haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:39365-39568
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwn:41229-41235
/haiku/vendor/freebsd/current/dev/iwn:34314-41228
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/malo:41233-41235
/haiku/vendor/freebsd/current/dev/malo:34496-41232
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/malo:41233-41235
/haiku/vendor/freebsd/current/dev/malo:34496-41232
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/mwl:41228-41235
/haiku/vendor/freebsd/current/dev/mwl:34314-41227
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/mwl:41228-41235
/haiku/vendor/freebsd/current/dev/mwl:34314-41227
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/ral:41232-41235
/haiku/vendor/freebsd/current/dev/ral:34496-41231
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/ral:41232-41235
/haiku/vendor/freebsd/current/dev/ral:34496-41231
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/wi:41227-41235
/haiku/vendor/freebsd/current/dev/wi:34496-41226
+
/haiku/trunk/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freebsd/RELEASE_8_2_0/dev/wi:41227-41235
/haiku/vendor/freebsd/current/dev/wi:34496-41226
Property changes on:
haiku/branches/releases/r1alpha3/src/add-ons/media/plugins/ffmpeg
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/src/add-ons/media/plugins/ffmpeg:40148-40195
/haiku/trunk/src/add-ons/media/plugins/ffmpeg:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/ffmpeg/0.6.1:39559
/haiku/vendor/ffmpeg/current:39539-39558
+
/haiku/branches/developer/bonefish/signals/src/add-ons/media/plugins/ffmpeg:40148-40195
/haiku/trunk/src/add-ons/media/plugins/ffmpeg:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/ffmpeg/0.6.1:39559
/haiku/vendor/ffmpeg/current:39539-39558
Modified:
haiku/branches/releases/r1alpha3/src/apps/installer/InstallerWindow.cpp
===================================================================
--- haiku/branches/releases/r1alpha3/src/apps/installer/InstallerWindow.cpp
2011-05-31 19:37:45 UTC (rev 41855)
+++ haiku/branches/releases/r1alpha3/src/apps/installer/InstallerWindow.cpp
2011-05-31 21:10:06 UTC (rev 41856)
@@ -49,9 +49,10 @@
#undef B_TRANSLATE_CONTEXT
#define B_TRANSLATE_CONTEXT "InstallerWindow"
-#define DRIVESETUP_SIG "application/x-vnd.Haiku-DriveSetup"
-#define BOOTMAN_SIG "application/x-vnd.Haiku-BootManager"
+static const char* kDriveSetupSignature = "application/x-vnd.Haiku-DriveSetup";
+static const char* kBootManagerSignature
+ = "application/x-vnd.Haiku-BootManager";
const uint32 BEGIN_MESSAGE = 'iBGN';
const uint32 SHOW_BOTTOM_MESSAGE = 'iSBT';
@@ -160,7 +161,7 @@
B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS),
fEncouragedToSetupPartitions(false),
fDriveSetupLaunched(false),
- fBootmanLaunched(false),
+ fBootManagerLaunched(false),
fInstallStatus(kReadyForInstall),
fWorkerThread(new WorkerThread(this)),
fCopyEngineCancelSemaphore(-1)
@@ -225,16 +226,16 @@
B_TRANSLATE("Set up partitions" B_UTF8_ELLIPSIS),
new BMessage(LAUNCH_DRIVE_SETUP));
- fLaunchBootmanItem = new BMenuItem(B_TRANSLATE("Set up boot menu"),
+ fLaunchBootManagerItem = new BMenuItem(B_TRANSLATE("Set up boot menu"),
new BMessage(LAUNCH_BOOTMAN));
- fLaunchBootmanItem->SetEnabled(false);
+ fLaunchBootManagerItem->SetEnabled(false);
fMakeBootableItem = new BMenuItem(B_TRANSLATE("Write boot sector"),
new BMessage(MSG_WRITE_BOOT_SECTOR));
fMakeBootableItem->SetEnabled(false);
BMenuBar* mainMenu = new BMenuBar("main menu");
BMenu* toolsMenu = new BMenu(B_TRANSLATE("Tools"));
- toolsMenu->AddItem(fLaunchBootmanItem);
+ toolsMenu->AddItem(fLaunchBootManagerItem);
toolsMenu->AddItem(fMakeBootableItem);
mainMenu->AddItem(toolsMenu);
@@ -289,7 +290,7 @@
"Partitions can be initialized with the\n"
"Be File System needed for a Haiku boot\n"
"partition."));
-// fLaunchBootmanItem->SetToolTip(
+// fLaunchBootManagerItem->SetToolTip(
// B_TRANSLATE("Install or uninstall the Haiku boot menu, which
allows "
// "to choose an operating system to boot when the computer
starts.\n"
// "If this computer already has a boot manager such as GRUB
installed, "
@@ -311,12 +312,12 @@
// Register to receive notifications when apps launch or quit...
be_roster->StartWatching(this);
// ... and check the two we are interested in.
- fDriveSetupLaunched = be_roster->IsRunning(DRIVESETUP_SIG);
- fBootmanLaunched = be_roster->IsRunning(BOOTMAN_SIG);
+ fDriveSetupLaunched = be_roster->IsRunning(kDriveSetupSignature);
+ fBootManagerLaunched = be_roster->IsRunning(kBootManagerSignature);
if (Lock()) {
fLaunchDriveSetupButton->SetEnabled(!fDriveSetupLaunched);
- fLaunchBootmanItem->SetEnabled(!fBootmanLaunched);
+ fLaunchBootManagerItem->SetEnabled(!fBootManagerLaunched);
Unlock();
}
@@ -412,7 +413,7 @@
_LaunchDriveSetup();
break;
case LAUNCH_BOOTMAN:
- _LaunchBootman();
+ _LaunchBootManager();
break;
case PACKAGE_CHECKBOX:
{
@@ -512,9 +513,9 @@
const char *signature;
if (msg->FindString("be:signature", &signature) != B_OK)
break;
- bool isDriveSetup = strcasecmp(signature,
DRIVESETUP_SIG) == 0;
- bool isBootman = strcasecmp(signature, BOOTMAN_SIG) ==
0;
- if (isDriveSetup || isBootman) {
+ bool isDriveSetup = !strcasecmp(signature,
kDriveSetupSignature);
+ bool isBootManager = !strcasecmp(signature,
kBootManagerSignature);
+ if (isDriveSetup || isBootManager) {
bool scanPartitions = false;
if (isDriveSetup) {
bool launched = msg->what ==
B_SOME_APP_LAUNCHED;
@@ -522,13 +523,13 @@
scanPartitions = fDriveSetupLaunched &&
!launched;
fDriveSetupLaunched = launched;
}
- if (isBootman)
- fBootmanLaunched = msg->what ==
B_SOME_APP_LAUNCHED;
+ if (isBootManager)
+ fBootManagerLaunched = msg->what ==
B_SOME_APP_LAUNCHED;
fBeginButton->SetEnabled(
- !fDriveSetupLaunched &&
!fBootmanLaunched);
- _DisableInterface(fDriveSetupLaunched ||
fBootmanLaunched);
- if (fDriveSetupLaunched && fBootmanLaunched) {
+ !fDriveSetupLaunched &&
!fBootManagerLaunched);
+ _DisableInterface(fDriveSetupLaunched ||
fBootManagerLaunched);
+ if (fDriveSetupLaunched &&
fBootManagerLaunched) {
_SetStatusMessage(B_TRANSLATE("Running
Boot Manager and "
"DriveSetup" B_UTF8_ELLIPSIS
"\n\nClose both applications to
continue with the "
@@ -538,7 +539,7 @@
B_UTF8_ELLIPSIS
"\n\nClose DriveSetup to
continue with the "
"installation."));
- } else if (fBootmanLaunched) {
+ } else if (fBootManagerLaunched) {
_SetStatusMessage(B_TRANSLATE("Running
Boot Manager"
B_UTF8_ELLIPSIS
"\n\nClose Boot Manager to
continue with the "
@@ -573,38 +574,40 @@
// This means Deskbar is not running, i.e. Installer is the only
// thing on the screen and we will reboot the machine once it
quits.
- if (fDriveSetupLaunched && fBootmanLaunched) {
+ if (fDriveSetupLaunched && fBootManagerLaunched) {
(new BAlert(B_TRANSLATE("Quit Boot Manager and
DriveSetup"),
B_TRANSLATE("Please close the Boot Manager and
DriveSetup "
"windows before closing the Installer
window."),
B_TRANSLATE("OK")))->Go();
return false;
- } else if (fDriveSetupLaunched) {
+ }
+ if (fDriveSetupLaunched) {
(new BAlert(B_TRANSLATE("Quit DriveSetup"),
B_TRANSLATE("Please close the DriveSetup window
before closing "
"the Installer window."),
B_TRANSLATE("OK")))->Go();
return false;
- } else if (fBootmanLaunched) {
+ }
+ if (fBootManagerLaunched) {
(new BAlert(B_TRANSLATE("Quit Boot Manager"),
B_TRANSLATE("Please close the Boot Manager
window before "
"closing the Installer window."),
B_TRANSLATE("OK")))->Go();
return false;
}
- if (fInstallStatus != kFinished)
- if ((new BAlert(B_TRANSLATE_SYSTEM_NAME("Installer"),
- B_TRANSLATE("Are you sure you want to abort the
installation "
- "and restart the system?"),
- B_TRANSLATE("Cancel"), B_TRANSLATE("Restart
system"), NULL,
- B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() == 0)
- return false;
-
- } else if (fInstallStatus == kInstalling) {
- if ((new BAlert(B_TRANSLATE_SYSTEM_NAME("Installer"),
+ if (fInstallStatus != kFinished
+ && (new BAlert(B_TRANSLATE_SYSTEM_NAME("Installer"),
+ B_TRANSLATE("Are you sure you want to
abort the "
+ "installation and restart the
system?"),
+ B_TRANSLATE("Cancel"),
B_TRANSLATE("Restart system"), NULL,
+ B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go()
== 0) {
+ return false;
+ }
+ } else if (fInstallStatus == kInstalling
+ && (new BAlert(B_TRANSLATE_SYSTEM_NAME("Installer"),
B_TRANSLATE("Are you sure you want to abort the
installation?"),
B_TRANSLATE("Cancel"), B_TRANSLATE("Abort"), NULL,
- B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() == 0)
- return false;
+ B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() == 0) {
+ return false;
}
_QuitCopyEngine(false);
@@ -630,7 +633,7 @@
void
InstallerWindow::_LaunchDriveSetup()
{
- if (be_roster->Launch(DRIVESETUP_SIG) != B_OK) {
+ if (be_roster->Launch(kDriveSetupSignature) != B_OK) {
// Try really hard to launch it. It's very likely that this
fails,
// when we run from the CD and there is only an incomplete mime
// database for example...
@@ -652,24 +655,25 @@
void
-InstallerWindow::_LaunchBootman()
+InstallerWindow::_LaunchBootManager()
{
- // TODO: Currently bootman always tries to install to the "first"
harddisk.
- // If/when it later supports being installed to a certain harddisk, we
- // would have to pass it the disk that contains the target partition
here.
- if (be_roster->Launch(BOOTMAN_SIG) != B_OK) {
+ // TODO: Currently BootManager always tries to install to the "first"
+ // harddisk. If/when it later supports being installed to a certain
+ // harddisk, we would have to pass it the disk that contains the target
+ // partition here.
+ if (be_roster->Launch(kBootManagerSignature) != B_OK) {
// Try really hard to launch it. It's very likely that this
fails,
// when we run from the CD and there is only an incomplete mime
// database for example...
BPath path;
- if (find_directory(B_SYSTEM_BIN_DIRECTORY, &path) != B_OK
- || path.Append("bootman") != B_OK) {
- path.SetTo("/boot/system/bin/bootman");
+ if (find_directory(B_SYSTEM_APPS_DIRECTORY, &path) != B_OK
+ || path.Append("BootManager") != B_OK) {
+ path.SetTo("/boot/system/apps/BootManager");
}
BEntry entry(path.Path());
entry_ref ref;
if (entry.GetRef(&ref) != B_OK || be_roster->Launch(&ref) !=
B_OK) {
- BAlert* alert = new BAlert("error",
B_TRANSLATE("Bootman, the "
+ BAlert* alert = new BAlert("error",
B_TRANSLATE("BootManager, the "
"application to configure the Haiku boot menu,
could not be "
"launched."), B_TRANSLATE("OK"));
alert->Go();
@@ -682,7 +686,7 @@
InstallerWindow::_DisableInterface(bool disable)
{
fLaunchDriveSetupButton->SetEnabled(!disable);
- fLaunchBootmanItem->SetEnabled(!disable);
+ fLaunchBootManagerItem->SetEnabled(!disable);
fMakeBootableItem->SetEnabled(!disable);
fSrcMenuField->SetEnabled(!disable);
fDestMenuField->SetEnabled(!disable);
@@ -785,7 +789,7 @@
fMakeBootableItem->SetLabel(label.String());
// TODO: Once bootman support writing to specific disks, enable this, since
// we would pass it the disk which contains the target partition.
-// fLaunchBootmanItem->SetEnabled(dstItem != NULL);
+// fLaunchBootManagerItem->SetEnabled(dstItem != NULL);
if (!fEncouragedToSetupPartitions && !foundOneSuitableTarget) {
// Focus the users attention on the DriveSetup button
Modified: haiku/branches/releases/r1alpha3/src/apps/installer/InstallerWindow.h
===================================================================
--- haiku/branches/releases/r1alpha3/src/apps/installer/InstallerWindow.h
2011-05-31 19:37:45 UTC (rev 41855)
+++ haiku/branches/releases/r1alpha3/src/apps/installer/InstallerWindow.h
2011-05-31 21:10:06 UTC (rev 41856)
@@ -6,9 +6,11 @@
#ifndef INSTALLER_WINDOW_H
#define INSTALLER_WINDOW_H
+
#include <String.h>
#include <Window.h>
+
namespace BPrivate {
class PaneSwitch;
};
@@ -55,7 +57,7 @@
private:
void _ShowOptionalPackages();
void _LaunchDriveSetup();
- void _LaunchBootman();
+ void _LaunchBootManager();
void _DisableInterface(bool
disable);
void _ScanPartitions();
void _UpdateControls();
@@ -88,13 +90,13 @@
BButton* fBeginButton;
BButton* fLaunchDriveSetupButton;
- BMenuItem* fLaunchBootmanItem;
+ BMenuItem* fLaunchBootManagerItem;
BMenuItem* fMakeBootableItem;
bool
fEncouragedToSetupPartitions;
bool fDriveSetupLaunched;
- bool fBootmanLaunched;
+ bool fBootManagerLaunched;
InstallStatus fInstallStatus;
WorkerThread* fWorkerThread;
@@ -102,4 +104,5 @@
sem_id
fCopyEngineCancelSemaphore;
};
+
#endif // INSTALLER_WINDOW_H
Property changes on:
haiku/branches/releases/r1alpha3/src/build/libbe/storage/mime
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/branches/developer/bonefish/signals/src/build/libbe/storage/mime:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/build/libbe/storage/mime:39365-39568
/haiku/trunk/src/build/libbe/storage/mime:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/trunk/current/src/build/libbe/storage/mime:11-11768
+
/haiku/branches/developer/bonefish/signals/src/build/libbe/storage/mime:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/build/libbe/storage/mime:39365-39568
/haiku/trunk/src/build/libbe/storage/mime:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/trunk/current/src/build/libbe/storage/mime:11-11768
Property changes on:
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/libs/compat/freebsd_wlan/net80211:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freebsd/RELEASE_8_2_0/net80211:41237
/haiku/vendor/freebsd/current/net80211:34316-41236
+
/haiku/trunk/src/libs/compat/freebsd_wlan/net80211:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freebsd/RELEASE_8_2_0/net80211:41237
/haiku/vendor/freebsd/current/net80211:34316-41236
Property changes on:
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.c:41237-41557
/haiku/vendor/freebsd/current/net80211/ieee80211_node.c:34316-41236
+
/haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.c:41237-41557
/haiku/vendor/freebsd/current/net80211/ieee80211_node.c:34316-41236
Property changes on:
haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.h:41237-41557
/haiku/vendor/freebsd/current/net80211/ieee80211_node.h:34316-41236
+
/haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.h:41237-41557
/haiku/vendor/freebsd/current/net80211/ieee80211_node.h:34316-41236
Property changes on: haiku/branches/releases/r1alpha3/src/libs/freetype2
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals/src/libs/freetype2:40148-40195
/haiku/trunk/src/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/freetype2/2.4.3:39521-39522
/haiku/vendor/freetype2/2.4.4/src:40532
/haiku/vendor/freetype2/current:37946-39520
/haiku/vendor/freetype2/current/src:37946-40531
+ /haiku/branches/developer/bonefish/signals/src/libs/freetype2:40148-40195
/haiku/trunk/src/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/freetype2/2.4.3:39521-39522
/haiku/vendor/freetype2/2.4.4/src:40532
/haiku/vendor/freetype2/current:37946-39520
/haiku/vendor/freetype2/current/src:37946-40531
Property changes on: haiku/branches/releases/r1alpha3/src/libs/png
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals/src/libs/png:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/libs/png:39365-39568
/haiku/trunk/src/libs/png:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/libpng/1.4.4:39522
/haiku/vendor/libpng/current:35840-39521
+ /haiku/branches/developer/bonefish/signals/src/libs/png:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/libs/png:39365-39568
/haiku/trunk/src/libs/png:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/libpng/1.4.4:39522
/haiku/vendor/libpng/current:35840-39521
Property changes on: haiku/branches/releases/r1alpha3/src/libs/tiff
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/branches/developer/bonefish/signals/src/libs/tiff:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/libs/tiff:39365-39568
/haiku/trunk/src/libs/tiff:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828
/haiku/vendor/libtiff/3.9.4/libtiff:38702
/haiku/vendor/libtiff/current/libtiff:38700-38701
+ /haiku/branches/developer/bonefish/signals/src/libs/tiff:40148-40195
/haiku/branches/developer/bonefish/weak-symbols/src/libs/tiff:39365-39568
/haiku/trunk/src/libs/tiff:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737,41744-41745,41762,41764-41767,41772-41774,41779-41781,41783-41784,41799,41801-41802,41812,41819-41820,41827-41828,41837,41848,41855
/haiku/vendor/libtiff/3.9.4/libtiff:38702
/haiku/vendor/libtiff/current/libtiff:38700-38701
Other related posts:
- » [haiku-commits] r41856 - in haiku/branches/releases/r1alpha3: . build/jam headers/libs/freetype2 headers/libs/png headers/libs/tiff ... - pulkomandy