Author: metze Date: 2007-01-15 13:28:09 +0000 (Mon, 15 Jan 2007) New Revision: 20804
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20804 Log: work arround HPUX and Tru64 make which don't like $$startdir we now call asn1_compile and compile_et via a wrapper script metze Added: branches/SAMBA_4_0/source/heimdal_build/asn1_compile_wrapper.sh branches/SAMBA_4_0/source/heimdal_build/et_compile_wrapper.sh Modified: branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl branches/SAMBA_4_0/source/heimdal_build/et_deps.pl Changeset: Added: branches/SAMBA_4_0/source/heimdal_build/asn1_compile_wrapper.sh =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/asn1_compile_wrapper.sh 2007-01-15 11:11:16 UTC (rev 20803) +++ branches/SAMBA_4_0/source/heimdal_build/asn1_compile_wrapper.sh 2007-01-15 13:28:09 UTC (rev 20804) @@ -0,0 +1,73 @@ +#!/bin/sh +# + +SELF=$0 +SELFDIR=`dirname ${SELF}` + +SRCDIR=$1 +BUILDDIR=$2 +DESTDIR=$3 + +CMD=$4 +FILE=$5 +NAME=$6 +shift 6 +OPTIONS="$@" + +test -z "${SRCDIR}" && { + echo "${SELF}:SRCDIR: '${SRCDIR}'" >&2; + exit 1; +} + +test -z "${BUILDDIR}" && { + echo "${SELF}:BUILDDIR: '${BUILDDIR}'" >&2; + exit 1; +} + +test -z "${DESTDIR}" && { + echo "${SELF}:DESTDIR: '${DESTDIR}'" >&2; + exit 1; +} + +test -z "${CMD}" && { + echo "${SELF}:CMD: '${CMD}'" >&2; + exit 1; +} + +test -z "${FILE}" && { + echo "${SELF}:FILE: '${FILE}'" >&2; + exit 1; +} + +test -z "${NAME}" && { + echo "${SELF}:NAME: '${NAME}'" >&2; + exit 1; +} + +CURDIR=`pwd` + +cd ${SRCDIR} && { + ABS_SRCDIR=`pwd` + cd ${CURDIR} +} || { + echo "${SELF}:cannot cd into '${SRCDIR}'" >&2; + exit 1; +} + +cd ${BUILDDIR} && { + ABS_BUILDDIR=`pwd` + cd ${CURDIR} +} || { + echo "${SELF}:cannot cd into '${BUILDDIR}'" >&2; + exit 1; +} + +cd ${DESTDIR} && { + ${ABS_BUILDDIR}/${CMD} ${OPTIONS} ${ABS_SRCDIR}/${FILE} ${NAME} >&2 || exit 1; + cd ${CURDIR} +} || { + echo "${SELF}:cannot cd into '${BUILDDIR}'" >&2; + exit 1; +} + +exit 0; Property changes on: branches/SAMBA_4_0/source/heimdal_build/asn1_compile_wrapper.sh ___________________________________________________________________ Name: svn:executable + * Modified: branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl 2007-01-15 11:11:16 UTC (rev 20803) +++ branches/SAMBA_4_0/source/heimdal_build/asn1_deps.pl 2007-01-15 13:28:09 UTC (rev 20804) @@ -25,7 +25,7 @@ print "$header: $file bin/asn1_compile\n"; print "[EMAIL PROTECTED] \"Compiling ASN1 file $file\"\n"; -print "[EMAIL PROTECTED] && cd $dirname && " . ' $$startdir/bin/asn1_compile ' . " $options " . '$$startdir/' . "$file $prefix\n\n"; +print "[EMAIL PROTECTED](builddir)/heimdal_build/asn1_compile_wrapper.sh \$(srcdir) \$(builddir) $dirname bin/asn1_compile $file $prefix $options\n\n"; open(IN,$file) or die("Can't open $file: $!"); foreach(<IN>) { @@ -49,19 +49,19 @@ print "CFLAGS = -Iheimdal_build -I$dirname\n"; print "OBJ_FILES = "; foreach $o_file (@o_files) { - print "\\\n\t$o_file "; + print "\\\n\t$o_file"; } print "\nPRIVATE_DEPENDENCIES = HEIMDAL_ASN1\n\n"; print "clean:: \n"; -print "[EMAIL PROTECTED] \"Deleting ASN1 output files generated from $file\""; -print "[EMAIL PROTECTED] -f $header"; +print "[EMAIL PROTECTED] \"Deleting ASN1 output files generated from $file\"\n"; +print "[EMAIL PROTECTED] -f $header\n"; foreach $c_file (@c_files) { - print "[EMAIL PROTECTED] -f $c_file"; + print "[EMAIL PROTECTED] -f $c_file\n"; } foreach $x_file (@x_files) { - print "[EMAIL PROTECTED] -f $x_file"; + print "[EMAIL PROTECTED] -f $x_file\n"; } -print "[EMAIL PROTECTED] -f $dirname/$prefix\_files"; -print "[EMAIL PROTECTED] -f $dirname/$prefix\.h"; -print "\n\n"; +print "[EMAIL PROTECTED] -f $dirname/$prefix\_files\n"; +print "[EMAIL PROTECTED] -f $dirname/$prefix\.h\n"; +print "\n"; Added: branches/SAMBA_4_0/source/heimdal_build/et_compile_wrapper.sh =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/et_compile_wrapper.sh 2007-01-15 11:11:16 UTC (rev 20803) +++ branches/SAMBA_4_0/source/heimdal_build/et_compile_wrapper.sh 2007-01-15 13:28:09 UTC (rev 20804) @@ -0,0 +1,66 @@ +#!/bin/sh +# + +SELF=$0 +SELFDIR=`dirname ${SELF}` + +SRCDIR=$1 +BUILDDIR=$2 +DESTDIR=$3 + +CMD=$4 +FILE=$5 +shift 5 + +test -z "${SRCDIR}" && { + echo "${SELF}:SRCDIR: '${SRCDIR}'" >&2; + exit 1; +} + +test -z "${BUILDDIR}" && { + echo "${SELF}:BUILDDIR: '${BUILDDIR}'" >&2; + exit 1; +} + +test -z "${DESTDIR}" && { + echo "${SELF}:DESTDIR: '${DESTDIR}'" >&2; + exit 1; +} + +test -z "${CMD}" && { + echo "${SELF}:CMD: '${CMD}'" >&2; + exit 1; +} + +test -z "${FILE}" && { + echo "${SELF}:FILE: '${FILE}'" >&2; + exit 1; +} + +CURDIR=`pwd` + +cd ${SRCDIR} && { + ABS_SRCDIR=`pwd` + cd ${CURDIR} +} || { + echo "${SELF}:cannot cd into '${SRCDIR}'" >&2; + exit 1; +} + +cd ${BUILDDIR} && { + ABS_BUILDDIR=`pwd` + cd ${CURDIR} +} || { + echo "${SELF}:cannot cd into '${BUILDDIR}'" >&2; + exit 1; +} + +cd ${DESTDIR} && { + ${ABS_BUILDDIR}/${CMD} ${ABS_SRCDIR}/${FILE} >&2 || exit 1; + cd ${CURDIR} +} || { + echo "${SELF}:cannot cd into '${BUILDDIR}'" >&2; + exit 1; +} + +exit 0; Property changes on: branches/SAMBA_4_0/source/heimdal_build/et_compile_wrapper.sh ___________________________________________________________________ Name: svn:executable + * Modified: branches/SAMBA_4_0/source/heimdal_build/et_deps.pl =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/et_deps.pl 2007-01-15 11:11:16 UTC (rev 20803) +++ branches/SAMBA_4_0/source/heimdal_build/et_deps.pl 2007-01-15 13:28:09 UTC (rev 20804) @@ -10,7 +10,7 @@ my $source = "$dirname/$basename"; $source =~ s/\.et$/.c/; print "$header $source: $file bin/compile_et\n"; print "[EMAIL PROTECTED] \"Compiling error table $file\"\n"; -print "[EMAIL PROTECTED] && cd $dirname && " . '$$startdir/bin/compile_et $$startdir/' . "$file\n\n"; +print "[EMAIL PROTECTED](builddir)/heimdal_build/et_compile_wrapper.sh \$(srcdir) \$(builddir) $dirname bin/compile_et $file\n\n"; print "clean:: \n"; -print "[EMAIL PROTECTED] -f $header $source"; +print "[EMAIL PROTECTED] -f $header $source\n\n";
