[haiku-commits] r40844 - haiku/trunk/build/jam
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 6 Mar 2011 16:10:31 +0100 (CET)
Author: mmadia
Date: 2011-03-06 16:10:31 +0100 (Sun, 06 Mar 2011)
New Revision: 40844
Changeset: http://dev.haiku-os.org/changeset/40844
Modified:
haiku/trunk/build/jam/OptionalPackages
Log:
Some cleanup. No functional change.
Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages 2011-03-06 14:14:37 UTC (rev
40843)
+++ haiku/trunk/build/jam/OptionalPackages 2011-03-06 15:10:31 UTC (rev
40844)
@@ -104,8 +104,7 @@
} else {
InstallOptionalHaikuImagePackage
ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip
- :
$(baseURL)/ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip
- ;
+ :
$(baseURL)/ABI-compliance-checker-1.12-noarch-gcc4-2010-02-01.zip ;
}
}
@@ -208,8 +207,7 @@
if [ IsOptionalHaikuImagePackageAdded BeBook ] {
InstallOptionalHaikuImagePackage bebook_20081026.zip
: $(baseURL)/bebook_20081026.zip
- : system documentation
- ;
+ : system documentation ;
AddSymlinkToHaikuImage home Desktop
: /boot/system/documentation/bebook/index.html : BeBook ;
}
@@ -261,8 +259,7 @@
InstallOptionalHaikuImagePackage
BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip
: $(baseURL)/BePDF-1.1.1b3-r1a2-x86-gcc2-2010-05-08.zip
- : apps
- ;
+ : apps ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BePDF/BePDF ;
AddSymlinkToHaikuImage common data licenses
@@ -294,8 +291,7 @@
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
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 ;
}
}
@@ -464,7 +460,6 @@
:
$(baseURL)/cvs-1.12.13-r1a2-x86-gcc2-2010-04-29-a.zip
: : true ;
}
-
InstallSourceArchive cvs-1.12.13_haiku-2010-04-29.tar.xz
:
$(baseSourceURL)/2010/cvs-1.12.13_haiku-2010-04-29.tar.xz ;
}
@@ -505,11 +500,9 @@
}
InstallSourceArchive automake-1.11.1_haiku-2010-04-29.tar.xz
- : $(baseSourceURL)/2010/automake-1.11.1_haiku-2010-04-29.tar.xz
- ;
+ : $(baseSourceURL)/2010/automake-1.11.1_haiku-2010-04-29.tar.xz
;
InstallSourceArchive texinfo-4.13a_haiku-2010-04-29.tar.xz
- : $(baseSourceURL)/2010/texinfo-4.13a_haiku-2010-04-29.tar.xz
- ;
+ : $(baseSourceURL)/2010/texinfo-4.13a_haiku-2010-04-29.tar.xz ;
}
@@ -727,7 +720,6 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package Doxygen available for $(TARGET_ARCH)"
;
} else {
-
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
doxygen-1.6.3-x86-gcc4-2010-05-17.zip
@@ -748,7 +740,6 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package Expat available for $(TARGET_ARCH)" ;
} else {
-
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
expat-2.0.1-x86-gcc4-2010-11-12.zip
@@ -760,7 +751,6 @@
:
$(baseURL)/expat-2.0.1-r1a2-x86-gcc2-2010-04-22-a.zip
: : true ;
}
-
InstallSourceArchive expat-2.0.1_haiku-2010-04-29.tar.xz
:
$(baseSourceURL)/2010/expat-2.0.1_haiku-2010-04-29.tar.xz ;
}
@@ -855,9 +845,7 @@
} else {
InstallOptionalHaikuImagePackage
groff-1.20.1-x86-gcc2-2010-08-31.zip
- : $(baseURL)/groff-1.20.1-x86-gcc2-2010-08-31.zip
- :
- ;
+ : $(baseURL)/groff-1.20.1-x86-gcc2-2010-08-31.zip ;
}
}
@@ -876,8 +864,7 @@
# unzip gcc4 to gcc4 subdir
InstallOptionalHaikuImagePackage
$(HAIKU_ICU_GCC_4_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_GCC_4_PACKAGE)
- : system lib gcc4
- ;
+ : system lib gcc4 ;
}
} else {
# unzip gcc4
@@ -888,8 +875,7 @@
# unzip gcc2 to gcc2 subdir
InstallOptionalHaikuImagePackage
$(HAIKU_ICU_GCC_2_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_GCC_2_PACKAGE)
- : system lib gcc2
- ;
+ : system lib gcc2 ;
}
}
}
@@ -899,8 +885,7 @@
# ICU-devel
if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
InstallOptionalHaikuImagePackage $(HAIKU_ICU_DEVEL_PACKAGE)
- : $(baseURL)/$(HAIKU_ICU_DEVEL_PACKAGE)
- ;
+ : $(baseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) ;
local arch = $(TARGET_ARCH) ;
local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
@@ -922,17 +907,13 @@
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip
- :
$(baseURL)/KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip
- :
- ;
+ :
$(baseURL)/KeymapSwitcher-1.2.6-x86-gcc4-2011-03-01.zip ;
AddSymlinkToHaikuImage home config be Desktop\ applets
: /boot/common/bin/KeymapSwitcher ;
} else {
InstallOptionalHaikuImagePackage
KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip
- :
$(baseURL)/KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip
- :
- ;
+ :
$(baseURL)/KeymapSwitcher-1.2.6-x86-gcc2-2011-03-01.zip ;
AddSymlinkToHaikuImage home config be Desktop\ applets
: /boot/common/bin/KeymapSwitcher ;
}
@@ -973,7 +954,6 @@
libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21-a.zip
:
$(baseURL)/libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21-a.zip ;
}
-
InstallSourceArchive libiconv-1.13.1_haiku-2010-04-29.tar.xz
:
$(baseSourceURL)/2010/libiconv-1.13.1_haiku-2010-04-29.tar.xz ;
}
@@ -1021,7 +1001,6 @@
libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22-a.zip
:
$(baseURL)/libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22-a.zip ;
}
-
InstallSourceArchive libxml2-2.7.7_haiku-2010-04-29.tar.xz
:
$(baseSourceURL)/2010/libxml2-2.7.7_haiku-2010-04-29.tar.xz ;
}
@@ -1222,7 +1201,6 @@
opensound-4.2-r1a2-x86-gcc2-2010-05-01.zip
: $(baseURL)/opensound-4.2-r1a2-x86-gcc2-2010-05-01.zip
;
}
- #ExtractArchiveToHaikuImage home : data/vv.mp3.zip : 0 ;
}
@@ -1280,9 +1258,7 @@
} else {
InstallOptionalHaikuImagePackage
p7zip-9.13-x86-gcc2-2011-02-25.zip
- : $(baseURL)/p7zip-9.13-x86-gcc2-2011-02-25.zip
- :
- ;
+ : $(baseURL)/p7zip-9.13-x86-gcc2-2011-02-25.zip
;
}
AddExpanderRuleToHaikuImage "application/x-7z-compressed" : .7z
: "7za l \\0045s"
@@ -1345,7 +1321,6 @@
pe-2.4.3-600-x86-gcc2-2010-09-28.zip
:
$(baseURL)/pe-2.4.3-600-x86-gcc2-2010-09-28.zip ;
}
-
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Pe/Pe ;
AddSymlinkToHaikuImage common bin
@@ -1370,7 +1345,6 @@
:
$(baseURL)/perl-5.10.1-r1a2-x86-gcc2-2010-04-25-a.zip
: : true ;
}
-
InstallSourceArchive perl-5.10.1_haiku-2010-04-29.tar.xz
:
$(baseSourceURL)/2010/perl-5.10.1_haiku-2010-04-29.tar.xz ;
}
@@ -1505,7 +1479,6 @@
tar-1.25-x86-gcc2-2011-02-07.zip
: $(baseURL)/tar-1.25-x86-gcc2-2011-02-07.zip ;
}
-
InstallSourceArchive tar-1.25_haiku-2011-02-07.tar.xz
:
$(baseSourceURL)/2011/tar-1.25_haiku-2011-02-07.tar.xz ;
}
@@ -1727,8 +1700,7 @@
} else {
InstallOptionalHaikuImagePackage WonderBrush-2.1.2.zip
: $(baseURL)/WonderBrush-2.1.2-x86-gcc2-2008-11-08.zip
- : apps
- ;
+ : apps ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/WonderBrush/WonderBrush ;
}
@@ -1757,7 +1729,6 @@
xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip
:
$(baseURL)/xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip ;
}
-
InstallSourceArchive xz-utils-4.999.9_haiku-2010-04-29.tar.xz
:
$(baseSourceURL)/2010/xz-utils-4.999.9_haiku-2010-04-29.tar.xz ;
AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
Other related posts:
- » [haiku-commits] r40844 - haiku/trunk/build/jam - mattmadia
