i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved ctags to an optional package

Browse Source 
* removed ctags from Haiku sources and from haiku image
* added ctags to mandatory packages for the time being.
This commit is contained in:
Jérôme Duval
2012-01-23 23:50:20 +01:00
parent f7865033f3
commit 1a4cf8161e
111 changed files with 24 additions and 43574 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+1 -1
View File
@@ -30,7 +30,7 @@ if $(HAIKU_ATA_STACK) = 1 {
SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bzip2
cal cat catattr checkfs checkitout chgrp chmod chop chown chroot cksum clear
clockconfig cmp collectcatkeys comm compress copyattr CortexAddOnHost cp
csplit ctags cut date dc dd desklink df diff diff3 dircolors dirname
csplit cut date dc dd desklink df diff diff3 dircolors dirname
draggers driveinfo dstcheck du dumpcatalog
echo eject env error expand expr
factor false fdinfo ffm filepanel find finddir fmt fold fortune frcode
build/jam/OptionalPackageDependencies
+1 -1
View File
@@ -36,4 +36,4 @@ OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite ;
OptionalPackageDependencies wpa_supplicant : OpenSSL ;
OptionalPackageDependencies XZ-Utils : Tar ;
OptionalPackageDependencies MandatoryPackages : ICU Sed Tar ;
OptionalPackageDependencies MandatoryPackages : Ctags ICU Sed Tar ;
build/jam/OptionalPackages
+22 -1
View File
@@ -32,8 +32,9 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# CDRecord - the command line CD writing tools
# Clockwerk - native audio/video compositing
# CLucene - indexed file search
# Curl - a client that groks URLs
# CMake - cross platform make
# Ctags - exuberant ctags (source files indexing)
# Curl - a client that groks URLs
# CVS - the version control system
# Development - more complete dev environment (including autotools)
# DevelopmentBase - basic development environment (gcc, headers, libs,...)
@@ -439,6 +440,26 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] {
}
# Ctags
if [ IsOptionalHaikuImagePackageAdded Ctags ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Ctags available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
ctags-5.8-x86-gcc4-2012-01-23.zip
: $(baseURL)/ctags-5.8-x86-gcc4-2012-01-23.zip
: : true ;
} else {
InstallOptionalHaikuImagePackage
ctags-5.8-x86-gcc2-2010-05-24.zip
: $(baseURL)/ctags-5.8-x86-gcc2-2010-05-24.zip
: : true ;
}
}
}
# Curl
if [ IsOptionalHaikuImagePackageAdded Curl ] {
if $(TARGET_ARCH) != x86 {