From 99a2774ca6f1cab334de5d43fe36fc44ae889a4c Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 12 Jun 2011 01:36:19 +0000 Subject: TQt4 convert kdesdk This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- scripts/svn2dist | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'scripts/svn2dist') diff --git a/scripts/svn2dist b/scripts/svn2dist index eb7ef8d9..377ef80c 100755 --- a/scripts/svn2dist +++ b/scripts/svn2dist @@ -6,7 +6,7 @@ # Original author (of cvs2pack.sh) was Sebastian Stein # Heavy, heavy modifications by Jason Katz-Brown # Some modifications for i18n inclusion by Dominique Devriese -# Added --no-i18n-lang and --replace-files by Michael Buesch +# Added --no-i18n-lang and --tqreplace-files by Michael Buesch # License: GPL (http://www.gnu.org/) # Last modification: 2005/01/08 @@ -17,7 +17,7 @@ cmdline="$@" returndir=`pwd` override="README ChangeLog INSTALL AUTHORS AUTHOR COPYING COPYING.LIB TODO COPYING-DOCS" -remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4 libtool subdirs *.moc *.la .libs .deps .svn .cvsignore autom4te.cache {arch} .arch-ids *.lo *.o *.bbg *.da *.bb" +remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4 libtool subdirs *.tqmoc *.la .libs .deps .svn .cvsignore autom4te.cache {arch} .arch-ids *.lo *.o *.bbg *.da *.bb" toplevelremove="configure.in.bot config.h config.h.bot config.h.in config.status config.log stamp-h stamp-h.in stamp-h1 subdirs configure.files " # whitespace seperated list of languages to never include. always_skip_languages="xx" @@ -40,7 +40,7 @@ test -e ~/.svn2distrc && extraoptions=`cat ~/.svn2distrc` # --log has optional argument TEMP=`getopt \ -o v:n:r:e:a:B:dhmbgol \ ---long log::,version:,name:,required-header:,required-header-error-message:,make-unpackaged,help,no-bz2,no-bzip2,no-gzip,only-directory,remove-hidden,admin-dir:,branch:,no-i18n,no-i18n-lang:,svn-root:,i18n-module:,debug,replace-files: \ +--long log::,version:,name:,required-header:,required-header-error-message:,make-unpackaged,help,no-bz2,no-bzip2,no-gzip,only-directory,remove-hidden,admin-dir:,branch:,no-i18n,no-i18n-lang:,svn-root:,i18n-module:,debug,tqreplace-files: \ -n svn2dist -- $extraoptions "$@"` if [ $? != 0 ]; then @@ -101,7 +101,7 @@ while true; do shift 2 ;; esac ;; - --replace-files) replace_files="$2"; shift 2 ;; + --tqreplace-files) replace_files="$2"; shift 2 ;; --) shift break ;; *) echo "Aborted." @@ -157,11 +157,11 @@ if [ ! -z $showhelp ] || [ -z $module ] || [ -z $directory ]; then echo " -e --required-header-error-message " echo " Error message for above." echo " -d --remove-hidden Remove hidden files/directories from packages" - echo " --replace-files " + echo " --tqreplace-files " echo " is a comma separated list of file pairs" echo " which should be replaced in the final distribution package." echo " Each element of a pair is separated by an @" - echo -n " Example: --replace-files take_this_file@and_move_it_here," + echo -n " Example: --tqreplace-files take_this_file@and_move_it_here," echo "configure.in.bot.dist@configure.in.bot" echo " The filenames are all relative to your package root." echo " Please be careful! Try to avoid the usage of .. in the path. It" @@ -222,7 +222,7 @@ cd $module directory=`echo $directory | sed -e 's#^/##'` pofiles="" -for makefile in `find $directory -name Makefile.am`; do +for makefile in `tqfind $directory -name Makefile.am`; do cat $makefile | while read line; do echo $line; done | perl -e '$mes=0; while () { if (/^messages:/) { $mes=1; next; } if ($_ !~ m/^[^\t ]/) { $mes=0; } if ($mes && /\$\(XGETTEXT\)/ && / -o/) { s,.*-o \$\(podir\)/([a-z._-]+).*$,$1, ; chomp $_; $_ =~ s/\.pot/.po/; print "pofiles=\"$_ \$pofiles\"\n" } }' > _tmppot . _tmppot rm -f _tmppot @@ -357,7 +357,7 @@ fi if [ -d $module/doc/$name ]; then mkdir -p $temp_dist/doc/$name cp -Rf $module/doc/$name $temp_dist/doc - find $module/doc/ -maxdepth 1 ! -xtype d | xargs --replace={} cp {} $temp_dist/doc + tqfind $module/doc/ -maxdepth 1 ! -xtype d | xargs --tqreplace={} cp {} $temp_dist/doc if [ $doi18n = "yes" ]; then pushd $temp_dir @@ -446,7 +446,7 @@ fi # and all files from the base dir, except directories echo "Copying over files from the module directory:" >> $log -find $module -maxdepth 1 ! -xtype d | xargs --verbose --replace={} cp {} $temp_dist 2>> $log +tqfind $module -maxdepth 1 ! -xtype d | xargs --verbose --tqreplace={} cp {} $temp_dist 2>> $log echo "--------" >> $log # we now enter the temp_dist and delete all unwanted files @@ -490,7 +490,7 @@ if [ -n "$replace_files" ]; then echo "$from_path does not exist!" >> $log echo "" echo "Warning: \"$from\" does not exist!" - echo -n "Please enter the path in --replace-files relative " + echo -n "Please enter the path in --tqreplace-files relative " echo "to the package root of your project." echo "Your package root is: \"$module/$directory\"" echo "" @@ -527,8 +527,8 @@ cd $temp_dist # remove files echo "Remove files: " >> $log for file in $remove; do - find . -name $file | xargs rm -Rf - echo "find . -name $file | xargs rm -Rf" >> $log + tqfind . -name $file | xargs rm -Rf + echo "tqfind . -name $file | xargs rm -Rf" >> $log done # remove more files @@ -539,7 +539,7 @@ done unset file # remove hidden files -test ! -z $removehidden && echo "Remove hidden files: " >> $log && find $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log +test ! -z $removehidden && echo "Remove hidden files: " >> $log && tqfind $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log echo "--------" >> $log -- cgit v1.2.3