More rpm work in progress. Work around some bugs in rules.mk.
git-svn-id: svn://10.0.0.236/trunk@51517 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
ef38d2fd9c
commit
4b4d193abc
@ -72,6 +72,8 @@ do
|
||||
|
||||
rm -f $tmp_raw $file_list $file_list_devel $tmp_file_list $tmp_file_list_devel
|
||||
|
||||
touch $tmp_raw $file_list $file_list_devel $tmp_file_list $tmp_file_list_devel
|
||||
|
||||
print_cmd=$mozdir/build/package/rpm/print-module-filelist.sh
|
||||
|
||||
here=`pwd`
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
dbm
|
||||
db
|
||||
xpcom
|
||||
intl
|
||||
js
|
||||
modules/security/freenav
|
||||
modules/libpref
|
||||
modules/libimg
|
||||
modules/libjar
|
||||
caps
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@ htmlparser
|
||||
gfx
|
||||
dom
|
||||
view
|
||||
widget/timer
|
||||
widget
|
||||
layout
|
||||
webshell
|
||||
|
||||
@ -25,6 +25,9 @@ list2=/tmp/list2-$$.txt
|
||||
|
||||
rm -rf $dist $list $list2
|
||||
|
||||
mkdir -p $dist
|
||||
mkdir -p $dist/include
|
||||
|
||||
make -s DIST=$dist XPDIST=$dist PUBLIC=$dist/include EXTRA_DEPS= >/dev/null 2>&1
|
||||
|
||||
cd $dist
|
||||
@ -49,11 +52,9 @@ do
|
||||
# Dont output files in "lib/" that are duplicated in "bin/"
|
||||
if [ -f "$bin_dup" ]
|
||||
then
|
||||
#echo "skipping $i"
|
||||
skip="true"
|
||||
fi
|
||||
|
||||
|
||||
# Test for files that need to be skipped
|
||||
file=`basename $i`
|
||||
|
||||
@ -84,6 +85,8 @@ do
|
||||
if [ "$skip" != "true" ]
|
||||
then
|
||||
echo $i >> $list2
|
||||
# else
|
||||
# echo "skipping $i"
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user