Fix location of the Deskbar menu symlinks

Conflicts:

	build/jam/OptionalPackages
This commit is contained in:
Ingo Weinhold
2011-11-25 06:19:34 +01:00
parent 609fc55f96
commit 14f94ae7d4
+18 -18
View File
@@ -156,7 +156,7 @@ if [ IsOptionalHaikuImagePackageAdded ArmyKnife ] {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
armyknife-63-r1a3-x86-gcc2-2011-06-04.zip armyknife-63-r1a3-x86-gcc2-2011-06-04.zip
: $(baseURL)/armyknife-63-r1a3-x86-gcc2-2011-06-04.zip ; : $(baseURL)/armyknife-63-r1a3-x86-gcc2-2011-06-04.zip ;
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/ArmyKnife/ArmyKnife ; : /boot/apps/ArmyKnife/ArmyKnife ;
} }
} }
@@ -190,7 +190,7 @@ if [ IsOptionalHaikuImagePackageAdded BeAE ] {
beae-22-r1a3-x86-gcc2-2011-05-18.zip beae-22-r1a3-x86-gcc2-2011-05-18.zip
: $(baseURL)/beae-22-r1a3-x86-gcc2-2011-05-18.zip ; : $(baseURL)/beae-22-r1a3-x86-gcc2-2011-05-18.zip ;
} }
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/BeAE/BeAE ; : /boot/apps/BeAE/BeAE ;
} }
} }
@@ -205,7 +205,7 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] {
} else { } else {
InstallOptionalHaikuImagePackage Beam-1.2alpha-x86-gcc2-2010-04-29.zip InstallOptionalHaikuImagePackage Beam-1.2alpha-x86-gcc2-2010-04-29.zip
: $(baseURL)/Beam-1.2alpha-x86-gcc2-2010-04-29.zip ; : $(baseURL)/Beam-1.2alpha-x86-gcc2-2010-04-29.zip ;
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/Beam/Beam ; : /boot/apps/Beam/Beam ;
} }
} }
@@ -264,7 +264,7 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip bepdf-1.1.1b4-r1a3-x86-gcc2-2011-05-30.zip
: $(baseURL)/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 AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/BePDF/BePDF ; : /boot/apps/BePDF/BePDF ;
} }
} }
@@ -284,7 +284,7 @@ if [ IsOptionalHaikuImagePackageAdded BeZillaBrowser ] {
BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc2-2010-05-02.zip BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc2-2010-05-02.zip
: $(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc2-2010-05-02.zip ; : $(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a2-x86-gcc2-2010-05-02.zip ;
} }
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/BeZillaBrowser/BeZillaBrowser ; : /boot/apps/BeZillaBrowser/BeZillaBrowser ;
InstallSourceArchive BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz InstallSourceArchive BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz
: $(baseSourceURL)/2010/BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz ; : $(baseSourceURL)/2010/BeZillaBrowser-2.0.0.22pre-r1a2-sources.tar.xz ;
@@ -302,7 +302,7 @@ if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
AddFilesToHaikuImage system add-ons kernel bluetooth : btCoreData hci ; AddFilesToHaikuImage system add-ons kernel bluetooth : btCoreData hci ;
AddFilesToHaikuImage system preferences : Bluetooth ; AddFilesToHaikuImage system preferences : Bluetooth ;
AddFilesToHaikuImage system bin : bt_dev_info bt_discovery ; AddFilesToHaikuImage system bin : bt_dev_info bt_discovery ;
AddSymlinkToHaikuImage home config be Preferences AddSymlinkToHaikuImage home config settings deskbar Preferences
: /boot/system/preferences/Bluetooth ; : /boot/system/preferences/Bluetooth ;
if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ]
&& $(HAIKU_GCC_VERSION[1]) in 2 4 { && $(HAIKU_GCC_VERSION[1]) in 2 4 {
@@ -328,7 +328,7 @@ if [ IsOptionalHaikuImagePackageAdded BurnItNow ] {
burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip
: $(baseURL)/burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip ; : $(baseURL)/burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip ;
} }
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/BurnItNow/BurnItNow ; : /boot/apps/BurnItNow/BurnItNow ;
} }
} }
@@ -398,7 +398,7 @@ if [ IsOptionalHaikuImagePackageAdded Clockwerk ] {
Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip
: $(baseURL)/Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip ; : $(baseURL)/Clockwerk-0.0.2-x86-gcc2-2010-10-13-1.zip ;
} }
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/Clockwerk/Clockwerk ; : /boot/apps/Clockwerk/Clockwerk ;
} }
} }
@@ -810,7 +810,7 @@ if [ IsOptionalHaikuImagePackageAdded friss ] {
friss-24-r1a3-x86-gcc2-2011-05-31.zip friss-24-r1a3-x86-gcc2-2011-05-31.zip
: $(baseURL)/friss-24-r1a3-x86-gcc2-2011-05-31.zip ; : $(baseURL)/friss-24-r1a3-x86-gcc2-2011-05-31.zip ;
} }
# AddSymlinkToHaikuImage home config be Desktop\ applets # AddSymlinkToHaikuImage home config settings deskbar Desktop\ applets
# : /boot/apps/FRiSS/FRiSS ; # : /boot/apps/FRiSS/FRiSS ;
} }
} }
@@ -960,7 +960,7 @@ if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
KeymapSwitcher-1.2.6-x86-gcc2-2011-11-07.zip KeymapSwitcher-1.2.6-x86-gcc2-2011-11-07.zip
: $(baseURL)/KeymapSwitcher-1.2.6-x86-gcc2-2011-11-07.zip ; : $(baseURL)/KeymapSwitcher-1.2.6-x86-gcc2-2011-11-07.zip ;
} }
AddSymlinkToHaikuImage home config be Preferences AddSymlinkToHaikuImage home config settings deskbar Preferences
: /boot/common/bin/KeymapSwitcher ; : /boot/common/bin/KeymapSwitcher ;
} }
} }
@@ -1077,7 +1077,7 @@ if [ IsOptionalHaikuImagePackageAdded Links ] {
} else { } else {
InstallOptionalHaikuImagePackage Links.zip InstallOptionalHaikuImagePackage Links.zip
: $(baseURL)/links-x86-gcc2-2008-05-03.zip ; : $(baseURL)/links-x86-gcc2-2008-05-03.zip ;
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/home/config/bin/links ; : /boot/home/config/bin/links ;
} }
} }
@@ -1220,7 +1220,7 @@ if [ IsOptionalHaikuImagePackageAdded NetSurf ] {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
netsurf-2.7-r1a3-x86-gcc2-2011-06-04.zip netsurf-2.7-r1a3-x86-gcc2-2011-06-04.zip
: $(baseURL)/netsurf-2.7-r1a3-x86-gcc2-2011-06-04.zip ; : $(baseURL)/netsurf-2.7-r1a3-x86-gcc2-2011-06-04.zip ;
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/NetSurf/NetSurf ; : /boot/apps/NetSurf/NetSurf ;
} }
} }
@@ -1335,7 +1335,7 @@ if [ IsOptionalHaikuImagePackageAdded Paladin ] {
: $(baseURL)/paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip ; : $(baseURL)/paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip ;
} }
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/Paladin/Paladin ; : /boot/apps/Paladin/Paladin ;
AddSymlinkToHaikuImage common bin AddSymlinkToHaikuImage common bin
: /boot/apps/Paladin/Paladin ; : /boot/apps/Paladin/Paladin ;
@@ -1375,7 +1375,7 @@ if [ IsOptionalHaikuImagePackageAdded Pe ] {
pe-2.4.3-600-r1a3-x86-gcc2-2011-05-18.zip pe-2.4.3-600-r1a3-x86-gcc2-2011-05-18.zip
: $(baseURL)/pe-2.4.3-600-r1a3-x86-gcc2-2011-05-18.zip ; : $(baseURL)/pe-2.4.3-600-r1a3-x86-gcc2-2011-05-18.zip ;
} }
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/Pe/Pe ; : /boot/apps/Pe/Pe ;
AddSymlinkToHaikuImage common bin AddSymlinkToHaikuImage common bin
: /boot/apps/Pe/lpe ; : /boot/apps/Pe/lpe ;
@@ -1650,7 +1650,7 @@ if [ IsOptionalHaikuImagePackageAdded Vim ] {
: $(baseURL)/vim-7.3-r1a3-x86-gcc2-2011-05-26.zip : $(baseURL)/vim-7.3-r1a3-x86-gcc2-2011-05-26.zip
: : true ; : : true ;
} }
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/common/bin/gvim ; : /boot/common/bin/gvim ;
# TODO: move this symlink to the archive # TODO: move this symlink to the archive
AddSymlinkToHaikuImage common bin : vim : vi ; AddSymlinkToHaikuImage common bin : vim : vi ;
@@ -1671,7 +1671,7 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {
vision-908-r1a3-x86-gcc2-2011-06-07.zip vision-908-r1a3-x86-gcc2-2011-06-07.zip
: $(baseURL)/vision-908-r1a3-x86-gcc2-2011-06-07.zip ; : $(baseURL)/vision-908-r1a3-x86-gcc2-2011-06-07.zip ;
} }
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/Vision/Vision ; : /boot/apps/Vision/Vision ;
} }
} }
@@ -1687,7 +1687,7 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
WebPositive-gcc4-x86-r583-2011-08-26.zip WebPositive-gcc4-x86-r583-2011-08-26.zip
: $(baseURL)/WebPositive-gcc4-x86-r583-2011-08-26.zip ; : $(baseURL)/WebPositive-gcc4-x86-r583-2011-08-26.zip ;
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/WebPositive/WebPositive ; : /boot/apps/WebPositive/WebPositive ;
} }
} }
@@ -1761,7 +1761,7 @@ if [ IsOptionalHaikuImagePackageAdded WonderBrush ] {
InstallOptionalHaikuImagePackage WonderBrush-2.1.2.zip InstallOptionalHaikuImagePackage WonderBrush-2.1.2.zip
: $(baseURL)/WonderBrush-2.1.2-x86-gcc2-2008-11-08.zip : $(baseURL)/WonderBrush-2.1.2-x86-gcc2-2008-11-08.zip
: apps ; : apps ;
AddSymlinkToHaikuImage home config be Applications AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/WonderBrush/WonderBrush ; : /boot/apps/WonderBrush/WonderBrush ;
} }
} }