summaryrefslogtreecommitdiff
path: root/soltools/testhxx
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-23 15:52:08 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-23 15:52:08 +0000
commit8034f570cbe5227a12a4cca420844f76d10dc623 (patch)
tree5197805798cf466db87ea43a50084f6a61f5da38 /soltools/testhxx
parentbc54cd7501259e237bbcf1edab5412cf6160b348 (diff)
CWS-TOOLING: integrate CWS ause100
2009-04-07 18:39:24 +0200 hjs r270608 : #i100932# add chmod to ease later removal 2009-04-03 19:18:44 +0200 hjs r270516 : #i100675# convert for now... 2009-04-03 17:40:55 +0200 hjs r270510 : #i100837# force use of GNU tar 2009-04-03 17:32:11 +0200 hjs r270508 : #i100837# clean tarballs and a readme 2009-04-03 17:29:35 +0200 hjs r270507 : #i100837# introduce $(TAR) and $(GNUTAR) 2009-04-03 12:22:47 +0200 hjs r270469 : #i100793# check for GNU tar 2009-03-30 17:30:20 +0200 hjs r270247 : #i100675# common comp_ver.mk for both windows shells 2009-03-30 13:49:55 +0200 hjs r270226 : #i100675# common comp_ver.mk for both windows shells 2009-03-30 13:36:00 +0200 hjs r270223 : #i100675# no backslash in dependencies 2009-03-30 13:34:14 +0200 hjs r270222 : #i100675# fix testhxx for cygwin 2009-03-27 16:34:33 +0100 hjs r270162 : #i98068# move that block where it makes sense 2009-03-27 16:16:41 +0100 hjs r270160 : #i92036# - two step move to have a simple rename in the shared dir
Diffstat (limited to 'soltools/testhxx')
-rw-r--r--soltools/testhxx/create.pl28
-rw-r--r--soltools/testhxx/testhxx.cxx3
2 files changed, 27 insertions, 4 deletions
diff --git a/soltools/testhxx/create.pl b/soltools/testhxx/create.pl
index b6c576c3195b..c0ee3586a9f9 100644
--- a/soltools/testhxx/create.pl
+++ b/soltools/testhxx/create.pl
@@ -91,9 +91,31 @@ if ($ENV{OS} eq 'LINUX') {
"\n";
print STDOUT 'QUIT %my_ret%', "\n";
} elsif ($ENV{OS} eq 'WNT' and $ENV{USE_SHELL} ne '4nt') {
- print STDOUT '#!/bin/bash', "\n";
- print STDOUT 'echo testhxx not yet available on this platform 1>&2', "\n";
- print STDOUT 'exit 1', "\n";
+ 1 while $in =~ s!\s+-I\s*\.\S*\s*! !g; # discard relative includes
+ $in =~ s!(\s+-I\s*)(?i:$solarversion)(\S*)!$1\${SOLARVERSION}$2!og;
+ # macrofy includes to solver
+ $in =~ s!\s+-Fo\s*\S+! -Fo$[my_tmp}obj! || die 'bad input: no -Fo';
+ $in =~ s!\s+-Zi\s! !;
+ $in =~ s!\s+-Fd\s*\S+!!;
+ print STDOUT '#!/bin/sh', "\n";
+ print STDOUT
+ 'my_tmp=${TMPDIR:-/tmp}/`id -u`_$$_include.cc', "\n";
+ print STDOUT 'my_pat=`dirname $1`', "\n";
+ print STDOUT 'my_fil=`basename $1`', "\n";
+ print STDOUT 'my_org=${PWD}', "\n";
+ print STDOUT 'cd $my_pat || exit 1', "\n";
+ print STDOUT 'my_pat=`pwd`', "\n";
+ print STDOUT 'cd $my_org || exit 1', "\n";
+ print STDOUT
+ 'echo "#include \\"${my_pat}/${my_fil}\\"" > ${my_tmp} || exit 1', "\n";
+ print STDOUT $in, ' > ${my_tmp}.out 2>&1', "\n";
+ print STDOUT 'my_ret=$?', "\n";
+ print STDOUT
+ 'if [ ${my_ret} -ne 0 ] ; then echo $1 >&2 ; cat ${my_tmp}.out >&2 ;',
+ ' fi', "\n";
+ print STDOUT 'unlink ${my_tmp} || exit 1', "\n";
+ print STDOUT 'unlink ${my_tmp}.out || exit 1', "\n";
+ print STDOUT 'exit ${my_ret}', "\n";
} else {
print STDOUT 'echo \'no testhxx on this platform\'', "\n";
}
diff --git a/soltools/testhxx/testhxx.cxx b/soltools/testhxx/testhxx.cxx
index ffe70d1bfeb1..fcded0bd9521 100644
--- a/soltools/testhxx/testhxx.cxx
+++ b/soltools/testhxx/testhxx.cxx
@@ -28,7 +28,8 @@
*
************************************************************************/
+// NO PCH here - breaks the purpose of this file
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
+//#include "precompiled_soltools.hxx"
// This is just a dummy file; see the makefile.mk for the real work.