* Added new rule AddHeaderDirectoryToHaikuImage that copies header
directories. Note that you need an updated "sed" (from the Haiku repository) if you want to use that rule. * The "Development" optional package now installs the Haiku headers needed to build stuff (ie. "os", "gnu", and "posix"). It also makes a symlink "be" so that we can still use the BeOS compiler with its builtin header paths. * Fixed AddVariableToScript for older shells that do not support '+='. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24058 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -10,6 +10,7 @@
|
||||
# imageSize
|
||||
# addBuildCompatibilityLibDir
|
||||
# sourceDirsToCopy
|
||||
# headerDirsToCopy
|
||||
# updateOnly
|
||||
# dontClearImage
|
||||
# isVMwareImage
|
||||
@@ -212,7 +213,7 @@ if [ $sourcePathPrefix = "." ]; then
|
||||
fi
|
||||
|
||||
for sourcesDir in ${sourceDirsToCopy}; do
|
||||
echo " sources dir: ${sourcesDir}"
|
||||
echo " sources dir: ${sourcesDir}"
|
||||
|
||||
# create all subdirectories
|
||||
subDirs=$(find ${sourcesDir} -type d | grep -v '.svn' |
|
||||
@@ -229,6 +230,43 @@ for sourcesDir in ${sourceDirsToCopy}; do
|
||||
done
|
||||
|
||||
|
||||
# install headers
|
||||
|
||||
headersDest=${tPrefix}develop
|
||||
|
||||
# create headers directory
|
||||
if [ -n "${headerDirsToCopy}" ]; then
|
||||
echo "Installing Haiku Headers ..."
|
||||
|
||||
$mkdir -p ${headersDest}
|
||||
fi
|
||||
|
||||
# See above (sourceDirs)
|
||||
sourcePathPrefix=$sourceDir
|
||||
destPathPrefix=$headersDest
|
||||
if [ $sourcePathPrefix = "." ]; then
|
||||
sourcePathPrefix=""
|
||||
destPathPrefix="${headersDest}/"
|
||||
fi
|
||||
|
||||
for headersDir in ${headerDirsToCopy}; do
|
||||
echo " header dir: ${headersDir}"
|
||||
|
||||
# create all subdirectories
|
||||
subDirs=$(find ${headersDir} -type d | grep -v '.svn' |
|
||||
sed -e "s@^${sourcePathPrefix}@${destPathPrefix}@")
|
||||
$mkdir -p ${subDirs}
|
||||
|
||||
# get all files and copy each one individually
|
||||
headerFiles=$(find $headersDir -type f | grep -v '.svn')
|
||||
for headerFile in $headerFiles; do
|
||||
destHeaderFile=$(echo $headerFile |
|
||||
sed -e "s@^${sourcePathPrefix}@${destPathPrefix}@")
|
||||
$cp ${sPrefix}$headerFile $destHeaderFile
|
||||
done
|
||||
done
|
||||
|
||||
|
||||
# unmount
|
||||
if [ $isImage ]; then
|
||||
echo "Unmounting ..."
|
||||
|
||||
Reference in New Issue
Block a user