summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure22
-rw-r--r--configure.in16
-rw-r--r--set_soenv.in3
-rw-r--r--solenv/bin/mhids.pl397
-rw-r--r--solenv/inc/_tg_rslb.mk160
-rw-r--r--solenv/inc/_tg_sdi.mk90
-rw-r--r--solenv/inc/_tg_srs.mk128
-rw-r--r--solenv/inc/rules.mk7
-rw-r--r--solenv/inc/target.mk47
-rw-r--r--solenv/inc/tg_rslb.mk16
-rw-r--r--solenv/inc/tg_sdi.mk9
-rw-r--r--solenv/inc/tg_srs.mk2
-rwxr-xr-xsoltools/HIDCompiler/hidclex.l951
-rw-r--r--soltools/HIDCompiler/makefile.mk63
-rw-r--r--soltools/HIDCompiler/wrap_hidclex.cxx31
-rw-r--r--soltools/prj/build.lst1
-rw-r--r--soltools/prj/d.lst2
17 files changed, 26 insertions, 1919 deletions
diff --git a/configure b/configure
index c17c609df4cf..f1ebbbce9e46 100755
--- a/configure
+++ b/configure
@@ -909,7 +909,6 @@ PERL
HAVE_LD_HASH_STYLE
_cc
GNUMAKE
-NO_HIDS
ENABLE_PCH
HAVE_LD_BSYMBOLIC_FUNCTIONS
GCCVER
@@ -1025,7 +1024,6 @@ enable_lockdown
enable_vba
with_vba_package_format
enable_pch
-enable_hids
enable_mozilla
with_fonts
with_ppds
@@ -1835,8 +1833,6 @@ Optional Features:
--enable-pch EXPERIMENTAL: Enables precompiled header support for C++.
- --enable-hids Enables generation of HelpId lists.
-
--disable-mozilla OO.o usually includes a strangely hacked up mozilla
binary for your platform, to build without this
version, use this option.
@@ -3771,11 +3767,6 @@ if test "${enable_pch+set}" = set; then :
enableval=$enable_pch;
fi
-# Check whether --enable-hids was given.
-if test "${enable_hids+set}" = set; then :
- enableval=$enable_hids;
-fi
-
# Check whether --enable-mozilla was given.
if test "${enable_mozilla+set}" = set; then :
enableval=$enable_mozilla;
@@ -6801,19 +6792,6 @@ $as_echo "no" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable hid list feature" >&5
-$as_echo_n "checking whether to enable hid list feature... " >&6; }
-if test -n "$enable_hids" && test "$enable_hids" != "no"; then
- NO_HIDS=""
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- NO_HIDS="TRUE"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
$as_echo_n "checking for GNU make... " >&6; }
for a in "$MAKE" $GNUMAKE make gmake gnumake; do
diff --git a/configure.in b/configure.in
index 64b7836dd4b9..587d21a7521c 100644
--- a/configure.in
+++ b/configure.in
@@ -70,9 +70,6 @@ AC_ARG_WITH(vba-package-format,
AC_ARG_ENABLE(pch,
[ --enable-pch EXPERIMENTAL: Enables precompiled header support for C++.
],,)
-AC_ARG_ENABLE(hids,
-[ --enable-hids Enables generation of HelpId lists.
-],,)
AC_ARG_ENABLE(mozilla,
[ --disable-mozilla OO.o usually includes a strangely hacked up mozilla
binary for your platform, to build without this
@@ -1539,19 +1536,6 @@ fi
AC_SUBST(ENABLE_PCH)
dnl ===================================================================
-dnl Set the NO_HIDS variable. (enable with --enable-hids)
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable hid list feature])
-if test -n "$enable_hids" && test "$enable_hids" != "no"; then
- NO_HIDS=""
- AC_MSG_RESULT([yes])
-else
- NO_HIDS="TRUE"
- AC_MSG_RESULT([no])
-fi
-AC_SUBST(NO_HIDS)
-
-dnl ===================================================================
dnl Search all the common names for GNU make
dnl ===================================================================
AC_MSG_CHECKING([for GNU make])
diff --git a/set_soenv.in b/set_soenv.in
index b39e397c0f7d..ab8693ed85b1 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -86,7 +86,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
$PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB,
$SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL,
$COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME,
- $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TMPDIR,
+ $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
$PROEXT, $TARFILE_LOCATION,
@@ -1789,7 +1789,6 @@ ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
ToFile( "ENABLE_DIRECTX", "@ENABLE_DIRECTX@", "e" );
ToFile( "ENABLE_LAYOUT", "@ENABLE_LAYOUT@", "e" );
ToFile( "ENABLE_PCH", "@ENABLE_PCH@", "e" );
-ToFile( "NO_HIDS", "@NO_HIDS@", "e" );
ToFile( "ENABLE_GRAPHITE", "@ENABLE_GRAPHITE@", "e");
ToFile( "SYSTEM_GRAPHITE", "@SYSTEM_GRAPHITE@", "e");
ToFile( "GRAPHITE_LIBS", "@GRAPHITE_LIBS@", "e");
diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl
deleted file mode 100644
index 82e50d1b9c91..000000000000
--- a/solenv/bin/mhids.pl
+++ /dev/null
@@ -1,397 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
- if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-my $filename;
-my $srs;
-my $prjname;
-my $defs;
-my $solarincludes;
-my $verbose = 0;
-
-my $debug = 0;
-my $filebase;
-my $workfile;
-my $shell_workfile;
-my @cleanuplist = ();
-
-# variables to setup the compiler line
-my $appext;
-my $compiler;
-my $outbin_flag;
-my $outobj_flag;
-my $objext;
-my $preprocess_flag; # preprocess to stdout
-
-my $no_hid_files;
-
-sub cleandie
-{
- my $errstring = shift @_;
- my $erroreval = $@;
-
- print STDERR "$errstring\n";
- if ( not $debug ) {
- foreach my $i (@cleanuplist) {
-# unlink "$workfile$i" if -f "$workfile$i" or print STDERR "ERROR - couldn't remove $workfile$i\n";
- if ( -f "$workfile$i" ) {
- unlink "$workfile$i" or print STDERR "ERROR - couldn't remove $workfile$i\n";
- }
- }
- }
- die "$erroreval\n";
-}
-
-sub setcompiler
-{
- my $whichcom = $ENV{COM};
- my $extra_cflags = $ENV{EXTRA_CFLAGS};
- $extra_cflags = "" if (!$extra_cflags);
- if ( "$whichcom" eq "GCC" ) {
- $appext = ""; # windows for now
- $compiler = "gcc -x c $extra_cflags";
- $outbin_flag = "-o ";
- $outobj_flag = "";
- $objext = ".o";
- $preprocess_flag = "-E"; # preprocess to stdout
- } elsif ( "$whichcom" eq "MSC" ) {
- $appext = ".exe"; # windows for now
- $compiler = "cl -nologo";
- $outbin_flag = "-Fe";
- $outobj_flag = "-Fo";
- $objext = ".obj";
- $preprocess_flag = "-EP"; # preprocess to stdout
- $solarincludes =~ s/\/stl/\/xstlx/g;
- $defs =~ s/\/stl/\/xstlx/g;
- } elsif ( "$whichcom" eq "C52" ) {
- $appext = ""; # windows for now
- $compiler = "cc";
- $outbin_flag = "-o ";
- $outobj_flag = "";
- $objext = ".o";
- $preprocess_flag = "-E"; # preprocess to stdout
-
- # hack for SO cc wrapper
- $ENV{wrapper_override_cc_wrapper} = "TRUE";
- $solarincludes =~ s/stl/xstlx/g;
- $defs =~ s/\/stl/\/xstlx/g;
- } else {
- print STDERR "----------------------------------------------------------------------\n";
- print STDERR "OOops... looks like your compiler isn't known to \n$0\n";
- print STDERR "please edit the \"setcompiler\" section of this script to make it work.\n";
- print STDERR "----------------------------------------------------------------------\n";
- die "ERROR - compiler (or \$COM settings) unknown!\n";
- }
-}
-
-#---------------------------------------------------
-$filename = undef;
-$srs = undef;
-$prjname = undef;
-
-my @expectedArgs = ( \$filename, \$srs, \$prjname );
-my $expectedArgsIndex = 0;
-while ( ( $#ARGV >= 0 ) && ( $expectedArgsIndex < 3 ) )
-{
- $_ = shift @ARGV;
- if ( /^-verbose$/ )
- {
- $verbose = 1;
- next;
- }
- ${$expectedArgs[ $expectedArgsIndex ]} = $_;
- ++$expectedArgsIndex;
-}
-
-$defs = join " ",@ARGV if ($#ARGV);
-
-if ( !defined $prjname ) { die "ERROR - check usage\n"; }
-
-if ( $ENV{NO_HID_FILES} ) {
- $no_hid_files = $ENV{"NO_HID_FILES"};
-}
-$solarincludes = $ENV{SOLARINCLUDES};
-if (defined $ENV{TMPDIR}) {
- $tmpdir = $ENV{TMPDIR};
-} elsif (defined $ENV{TMP}) {
- $tmpdir = $ENV{TMP};
-} else {
- die "ERROR - \"TMPDIR\" & \"TMP\" environment variables not set\n";
-};
-die "ERROR - \"$tmpdir\" doesn't exist\n" if ( ! -d $tmpdir );
-
-setcompiler();
-
-# convert windows only?
-$srs =~ s/\\/\//g;
-$filename =~ s/\\/\//g;
-
-$filebase = $filename;
-$filebase =~ s/.*[\\\/]//;
-$filebase =~ s/\..*?$//;
-# now stript it to something that doesn't togger vista execution prevention :(
-$flbs = $filebase;
-$flbs =~ s/[aeiou]//g;
-# call srand ony once per script!
-srand();
-$workfile = "$tmpdir/${flbs}_".$$.rand();
-#$workfile =~ s/setup/set_up/;
-
-# now get $workfile ready for shell usage...
-$shell_workfile = $workfile;
-
-print "workfile: $workfile\n" if $verbose;
-
-#remove old objects which remained in place by a former bug
-unlink "$workfile.obj";
-
-# can't do this for modules with mixed case!
-#$prjname =~ lc $prjname;
-
-if ( -f "$workfile.hid" )
-{
- unlink "$workfile.hid" or die "ERRROR - cannot remove $workfile.hid\n";
-}
-
-# hack to quit for files which cannot be handled
-if ( defined $ENV{"NO_HID_FILES"} ) {
- foreach $fname ( split / /, $ENV{"NO_HID_FILES"} )
- {
- if ( $fname eq $filename )
- {
- print "No hid generation for $filename due to NO_HID_FILES\n";
- print "Touching $srs/$filebase.hid anyways\n";
- open TOUCH, ">$srs/$filebase.hid" or die "ERRROR - cannot open $srs/$filebase.hid for writing\n";
- close TOUCH;
- exit 0;
- }
- }
-}
-
-#echo "perl5 -p -e "s/=[ \t]*\".*\"/=\"\"/go; s/\".*\"[ \t]*;/\"\" ;/go ; s/(\".*)\/\/(.*\")/$1\/\\\/$2/go ;" < %filename% > %srs%\%workfile%.c0"
-#call perl5 -p -e "s/=[ \t]*\".*\"/=\"\"/go; s/\".*\"[ \t]*;/\"\" ;/go ; s/(\".*)\/\/(.*\")/$1\/\\\/$2/go ;" < %filename% > %srs%\%workfile%.c0
-
-my $verboseSwitch = $verbose ? "-verbose" : "";
-print "$ENV{SOLARBINDIR}/hidc $verboseSwitch $filename ${shell_workfile}.c1 $prjname\n" if $verbose;
-$ret = system "$ENV{SOLARBINDIR}/hidc $verboseSwitch $filename ${shell_workfile}.c1 $prjname";
-if ( $ret ) {
- push @cleanuplist, ".c1";
- cleandie("ERROR - calling \"hidc\" failed");
-}
-push @cleanuplist, ".c1";
-
-print "$compiler $defs $solarincludes $preprocess_flag ${shell_workfile}.c1 > ${shell_workfile}.c2\n" if $verbose;
-$ret = system "$compiler $defs $solarincludes $preprocess_flag ${shell_workfile}.c1 > ${shell_workfile}.c2";
-if ( $ret ) {
- push @cleanuplist, ".c2";
- cleandie("ERROR - calling compiler for preprocessing failed");
-}
-push @cleanuplist, ".c2";
-
-if (!open C_PROG, ">$workfile.c") {
- push @cleanuplist, ".c";
- cleandie("ERROR - open $workfile.c\n for writing failed");
-}
-push @cleanuplist, ".c";
-print C_PROG "#include <stdio.h>\n";
-print C_PROG "#include <wctype.h>\n";
-
-if ( !open PRE, "<$workfile.c2" ) {
- cleandie("ERROR - open $workfile.c2\n for reading failed");
-}
-
-$InMain = 0;
-while (<PRE>)
-{
- if ( /int\s*main/ )
- {
- $InMain = 1;
- }
-
- if ( $InMain && !/^\s*$/ )
- {
- print C_PROG;
- }
-}
-
-close PRE;
-close C_PROG;
-
-#cl %SOLARINCLUDES% %_srs%\%_workfile%.c /Fe%_srs%\%_workfile%$appext
-my $outobj_param = "";
-if ( $outobj_flag ne "" )
-{
- $outobj_param = "$outobj_flag${shell_workfile}$objext";
-}
-print "$compiler $defs $solarincludes ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext \n" if $verbose;
-$ret = system "$compiler $defs $solarincludes ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext";
-if ( $ret ) {
- push @cleanuplist, "$appext";
- cleandie("ERROR - compiling $workfile.c failed");
-}
-push @cleanuplist, "$objext";
-push @cleanuplist, "$appext";
-
-#awk -f %ENV_TOOLS%\hidcode.awk < %srs%\%workfile%.c3 > %srs%\%workfile%.hid
-if ( !open C3,"$workfile$appext|" ) {
- cleandie("ERROR - executing $workfile$appext failed");
-}
-if ( !open HID,">$srs/$filebase.hid.$ENV{INPATH}" ) {
- cleandie("ERROR - open $srs/$filebase.hid.$ENV{INPATH} for writing failed");
-}
-
-while (<C3>)
-{
- @fields = split /\s+/;
- if ( $fields[1] eq "HelpID" )
- {
- print HID "$fields[0] $fields[2]\n";
- next;
- }
-
- @arr = split /:/, $fields[0];
- if( $arr[1] =~ /^leer$|^bitmap$|^font$|^color$|^image$|^imagelist$|^date$|^brush$|^fixedtext$|^keycode$|^time$|^mapmode$/i )
- {
- #print "skipping $arr[1]\n";
- next;
- }
-
- if ( $fields[1] eq "Norm" )
- {
- # Felder der Zeile auf Variable verteilen
- $helpIDString = $fields[0];
- $GClass = lc($fields[2]);
- $GID = $fields[3];
- $LClass = lc($fields[4]);
- $LID = $fields[5] || 0;
-
- #print $LID
- #print $LClass
- #print $GID
- #print $GClass
-
- $nHID=0;
-
- $VAL1 = 536870912; #2 hoch 29
- if ( $GClass eq "workwindow" ) { $nHID= $VAL1 *5; }
- elsif( $GClass eq "modelessdialog" ) { $nHID= $VAL1 *4; }
- elsif( $GClass eq "floatingwindow" ) { $nHID= $VAL1 *3; }
- elsif( $GClass eq "modaldialog" ) { $nHID= $VAL1 *2; }
- elsif( $GClass eq "tabpage" ) { $nHID= $VAL1 *1; }
- elsif( $GClass eq "dockingwindow" ) { $nHID= $VAL1 *6; }
- #Maximal bis 7 dann sind 32Bit ausgeschoepft
- else {
- $nHID=0;
- $outline = "No GClass ".$helpIDString." ".$nHID." ".$GClass;
- #print "$outline\n";
- next;
- }
- if( $LID != 0 ) {
- if ( $LClass eq "tabcontrol" ) { $nHID += 0; }
- elsif( $LClass eq "radiobutton" ) { $nHID += 2*256; }
- elsif( $LClass eq "checkbox" ) { $nHID += 4*256; }
- elsif( $LClass eq "tristatebox" ) { $nHID += 6*256; }
- elsif( $LClass eq "edit" ) { $nHID += 8*256; }
- elsif( $LClass eq "multilineedit" ) { $nHID += 10*256; }
- elsif( $LClass eq "multilistbox" ) { $nHID += 12*256; }
- elsif( $LClass eq "listbox" ) { $nHID += 14*256; }
- elsif( $LClass eq "combobox" ) { $nHID += 16*256; }
- elsif( $LClass eq "pushbutton" ) { $nHID += 18*256; }
- elsif( $LClass eq "spinfield" ) { $nHID += 20*256; }
- elsif( $LClass eq "patternfield" ) { $nHID += 22*256; }
- elsif( $LClass eq "numericfield" ) { $nHID += 24*256; }
- elsif( $LClass eq "metricfield" ) { $nHID += 26*256; }
- elsif( $LClass eq "currencyfield" ) { $nHID += 28*256; }
- elsif( $LClass eq "datefield" ) { $nHID += 30*256; }
- elsif( $LClass eq "timefield" ) { $nHID += 32*256; }
- elsif( $LClass eq "imageradiobutton" ) { $nHID += 34*256; }
- elsif( $LClass eq "numericbox" ) { $nHID += 36*256; }
- elsif( $LClass eq "metricbox" ) { $nHID += 38*256; }
- elsif( $LClass eq "currencybox" ) { $nHID += 40*256; }
- elsif( $LClass eq "datebox" ) { $nHID += 42*256; }
- elsif( $LClass eq "timebox" ) { $nHID += 44*256; }
- elsif( $LClass eq "imagebutton" ) { $nHID += 46*256; }
- elsif( $LClass eq "menubutton" ) { $nHID += 48*256; }
- elsif( $LClass eq "morebutton" ) { $nHID += 50*256; }
- else {
- $nHID=0;
- $outline = "No LClass ".$helpIDString." ".$nHID;
- #print "$outline\n";
- next;
- }
-
- #GID und LID auch beruecksichtigen
- $nHID += $LID;
- }
- $nHID += $GID * 16384; #14 Bit nach links shiften
-
- # check here and not above to avoid warnings for restypes not generated anyways
- if( $GID == 0 || $GID >32767 || $LID > 511 )
- {
- #GID & LID ungueltig
- print STDERR "Invalid Global or Local ID: 0 < GID <= 32767 ; LID <= 511\n";
- print STDERR "$helpIDString GID = $GID; LID = $LID\n";
- next;
- }
-
- #
- # 1. Stelle selber ausgeben, falls groesser als 2^21
- # wg. problemen von awk/gawk bei printf mit %u
- #
- $x=0;
- if( $nHID >= 4000000000 ) {
- $nHID -= 4000000000;
- $x=4;
- }elsif( $nHID >= 3000000000) {
- $nHID -= 3000000000;
- $x=3;
- }elsif( $nHID >= 2000000000) {
- $nHID -= 2000000000;
- $x=2;
- }
- if ( $LID != 0)
- { printf HID "%s %s.%s.%s.%s \n", $helpIDString, $arr[0], $arr[1], $GID, $LID; }
- else
- { printf HID "%s %s.%s.%s \n", $helpIDString, $arr[0], $arr[1], $GID }
- }
-}
-
-close C3;
-close HID;
-
-rename("$srs/$filebase.hid.$ENV{INPATH}", "$srs/$filebase.hid") or cleandie("ERROR - couldn't rename tmp file to final for $filebase");
-
-if ( not $debug ) {
- foreach my $i (@cleanuplist) {
- sleep 1;
- if ( -f "$workfile$i" ) {
- unlink "$workfile$i" or cleandie("");
- }
- }
-}
diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
index 273ac8dabe1b..4c67a1d58c97 100644
--- a/solenv/inc/_tg_rslb.mk
+++ b/solenv/inc/_tg_rslb.mk
@@ -2,22 +2,6 @@
.IF "$(RESLIB1TARGETN)"!=""
-.IF "$(BUILDHIDS)"!=""
-HIDRES1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB1NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB1HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB1SRSFILES)))
-$(HIDRES1PARTICLE): $(RESLIB1HIDFILES)
- @echo "Making: " $(@:f)
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB1HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES1PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
$(RSC_MULTI1) : \
$(RESLIB1SRSFILES) \
$(RESLIB1TARGETN) \
@@ -79,22 +63,6 @@ $(RESLIB1TARGETN): \
.IF "$(RESLIB2TARGETN)"!=""
-.IF "$(BUILDHIDS)"!=""
-HIDRES2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB2NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB2HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB2SRSFILES)))
-$(HIDRES2PARTICLE): $(RESLIB2HIDFILES)
- @echo "Making: " $(@:f)
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB2HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES2PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
$(RSC_MULTI2) : \
$(RESLIB2SRSFILES) \
$(RESLIB2TARGETN) \
@@ -156,22 +124,6 @@ $(RESLIB2TARGETN): \
.IF "$(RESLIB3TARGETN)"!=""
-.IF "$(BUILDHIDS)"!=""
-HIDRES3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB3NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB3HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB3SRSFILES)))
-$(HIDRES3PARTICLE): $(RESLIB3HIDFILES)
- @echo "Making: " $(@:f)
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB3HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES3PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
$(RSC_MULTI3) : \
$(RESLIB3SRSFILES) \
$(RESLIB3TARGETN) \
@@ -233,22 +185,6 @@ $(RESLIB3TARGETN): \
.IF "$(RESLIB4TARGETN)"!=""
-.IF "$(BUILDHIDS)"!=""
-HIDRES4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB4NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB4HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB4SRSFILES)))
-$(HIDRES4PARTICLE): $(RESLIB4HIDFILES)
- @echo "Making: " $(@:f)
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB4HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES4PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
$(RSC_MULTI4) : \
$(RESLIB4SRSFILES) \
$(RESLIB4TARGETN) \
@@ -310,22 +246,6 @@ $(RESLIB4TARGETN): \
.IF "$(RESLIB5TARGETN)"!=""
-.IF "$(BUILDHIDS)"!=""
-HIDRES5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB5NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB5HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB5SRSFILES)))
-$(HIDRES5PARTICLE): $(RESLIB5HIDFILES)
- @echo "Making: " $(@:f)
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB5HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES5PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
$(RSC_MULTI5) : \
$(RESLIB5SRSFILES) \
$(RESLIB5TARGETN) \
@@ -387,22 +307,6 @@ $(RESLIB5TARGETN): \
.IF "$(RESLIB6TARGETN)"!=""
-.IF "$(BUILDHIDS)"!=""
-HIDRES6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB6NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB6HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB6SRSFILES)))
-$(HIDRES6PARTICLE): $(RESLIB6HIDFILES)
- @echo "Making: " $(@:f)
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB6HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES6PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
$(RSC_MULTI6) : \
$(RESLIB6SRSFILES) \
$(RESLIB6TARGETN) \
@@ -464,22 +368,6 @@ $(RESLIB6TARGETN): \
.IF "$(RESLIB7TARGETN)"!=""
-.IF "$(BUILDHIDS)"!=""
-HIDRES7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB7NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB7HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB7SRSFILES)))
-$(HIDRES7PARTICLE): $(RESLIB7HIDFILES)
- @echo "Making: " $(@:f)
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB7HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES7PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
$(RSC_MULTI7) : \
$(RESLIB7SRSFILES) \
$(RESLIB7TARGETN) \
@@ -541,22 +429,6 @@ $(RESLIB7TARGETN): \
.IF "$(RESLIB8TARGETN)"!=""
-.IF "$(BUILDHIDS)"!=""
-HIDRES8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB8NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB8HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB8SRSFILES)))
-$(HIDRES8PARTICLE): $(RESLIB8HIDFILES)
- @echo "Making: " $(@:f)
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB8HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES8PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
$(RSC_MULTI8) : \
$(RESLIB8SRSFILES) \
$(RESLIB8TARGETN) \
@@ -618,22 +490,6 @@ $(RESLIB8TARGETN): \
.IF "$(RESLIB9TARGETN)"!=""
-.IF "$(BUILDHIDS)"!=""
-HIDRES9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB9NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB9HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB9SRSFILES)))
-$(HIDRES9PARTICLE): $(RESLIB9HIDFILES)
- @echo "Making: " $(@:f)
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB9HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES9PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
$(RSC_MULTI9) : \
$(RESLIB9SRSFILES) \
$(RESLIB9TARGETN) \
@@ -695,22 +551,6 @@ $(RESLIB9TARGETN): \
.IF "$(RESLIB10TARGETN)"!=""
-.IF "$(BUILDHIDS)"!=""
-HIDRES10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB10NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB10HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB10SRSFILES)))
-$(HIDRES10PARTICLE): $(RESLIB10HIDFILES)
- @echo "Making: " $(@:f)
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB10HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES10PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
$(RSC_MULTI10) : \
$(RESLIB10SRSFILES) \
$(RESLIB10TARGETN) \
diff --git a/solenv/inc/_tg_sdi.mk b/solenv/inc/_tg_sdi.mk
index 5b3db9c696b7..45ea433b04b2 100644
--- a/solenv/inc/_tg_sdi.mk
+++ b/solenv/inc/_tg_sdi.mk
@@ -1,14 +1,5 @@
# unroll begin
-.IF "$(HIDSID1PARTICLE)"!=""
-$(HIDSID1PARTICLE): $(SDI1TARGET)
- @echo "Making: " $(@:f)
- @-$(RM) $@.$(ROUT).tmp $@
- @$(TYPE) $(MISC)/$(SDI1NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
- @-$(RM) $@
- @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID1PARTICLE)"!=""
-
.IF "$(SDI1TARGET)"!=""
$(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
@echo "Making: " $(@:f)
@@ -27,15 +18,6 @@ $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
# Instruction for ???
# unroll begin
-.IF "$(HIDSID2PARTICLE)"!=""
-$(HIDSID2PARTICLE): $(SDI2TARGET)
- @echo "Making: " $(@:f)
- @-$(RM) $@.$(ROUT).tmp $@
- @$(TYPE) $(MISC)/$(SDI2NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
- @-$(RM) $@
- @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID2PARTICLE)"!=""
-
.IF "$(SDI2TARGET)"!=""
$(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi
@echo "Making: " $(@:f)
@@ -54,15 +36,6 @@ $(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi
# Instruction for ???
# unroll begin
-.IF "$(HIDSID3PARTICLE)"!=""
-$(HIDSID3PARTICLE): $(SDI3TARGET)
- @echo "Making: " $(@:f)
- @-$(RM) $@.$(ROUT).tmp $@
- @$(TYPE) $(MISC)/$(SDI3NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
- @-$(RM) $@
- @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID3PARTICLE)"!=""
-
.IF "$(SDI3TARGET)"!=""
$(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi
@echo "Making: " $(@:f)
@@ -81,15 +54,6 @@ $(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi
# Instruction for ???
# unroll begin
-.IF "$(HIDSID4PARTICLE)"!=""
-$(HIDSID4PARTICLE): $(SDI4TARGET)
- @echo "Making: " $(@:f)
- @-$(RM) $@.$(ROUT).tmp $@
- @$(TYPE) $(MISC)/$(SDI4NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
- @-$(RM) $@
- @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID4PARTICLE)"!=""
-
.IF "$(SDI4TARGET)"!=""
$(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi
@echo "Making: " $(@:f)
@@ -108,15 +72,6 @@ $(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi
# Instruction for ???
# unroll begin
-.IF "$(HIDSID5PARTICLE)"!=""
-$(HIDSID5PARTICLE): $(SDI5TARGET)
- @echo "Making: " $(@:f)
- @-$(RM) $@.$(ROUT).tmp $@
- @$(TYPE) $(MISC)/$(SDI5NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
- @-$(RM) $@
- @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID5PARTICLE)"!=""
-
.IF "$(SDI5TARGET)"!=""
$(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi
@echo "Making: " $(@:f)
@@ -135,15 +90,6 @@ $(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi
# Instruction for ???
# unroll begin
-.IF "$(HIDSID6PARTICLE)"!=""
-$(HIDSID6PARTICLE): $(SDI6TARGET)
- @echo "Making: " $(@:f)
- @-$(RM) $@.$(ROUT).tmp $@
- @$(TYPE) $(MISC)/$(SDI6NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
- @-$(RM) $@
- @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID6PARTICLE)"!=""
-
.IF "$(SDI6TARGET)"!=""
$(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi
@echo "Making: " $(@:f)
@@ -162,15 +108,6 @@ $(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi
# Instruction for ???
# unroll begin
-.IF "$(HIDSID7PARTICLE)"!=""
-$(HIDSID7PARTICLE): $(SDI7TARGET)
- @echo "Making: " $(@:f)
- @-$(RM) $@.$(ROUT).tmp $@
- @$(TYPE) $(MISC)/$(SDI7NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
- @-$(RM) $@
- @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID7PARTICLE)"!=""
-
.IF "$(SDI7TARGET)"!=""
$(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi
@echo "Making: " $(@:f)
@@ -189,15 +126,6 @@ $(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi
# Instruction for ???
# unroll begin
-.IF "$(HIDSID8PARTICLE)"!=""
-$(HIDSID8PARTICLE): $(SDI8TARGET)
- @echo "Making: " $(@:f)
- @-$(RM) $@.$(ROUT).tmp $@
- @$(TYPE) $(MISC)/$(SDI8NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
- @-$(RM) $@
- @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID8PARTICLE)"!=""
-
.IF "$(SDI8TARGET)"!=""
$(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi
@echo "Making: " $(@:f)
@@ -216,15 +144,6 @@ $(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi
# Instruction for ???
# unroll begin
-.IF "$(HIDSID9PARTICLE)"!=""
-$(HIDSID9PARTICLE): $(SDI9TARGET)
- @echo "Making: " $(@:f)
- @-$(RM) $@.$(ROUT).tmp $@
- @$(TYPE) $(MISC)/$(SDI9NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
- @-$(RM) $@
- @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID9PARTICLE)"!=""
-
.IF "$(SDI9TARGET)"!=""
$(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi
@echo "Making: " $(@:f)
@@ -243,15 +162,6 @@ $(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi
# Instruction for ???
# unroll begin
-.IF "$(HIDSID10PARTICLE)"!=""
-$(HIDSID10PARTICLE): $(SDI10TARGET)
- @echo "Making: " $(@:f)
- @-$(RM) $@.$(ROUT).tmp $@
- @$(TYPE) $(MISC)/$(SDI10NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
- @-$(RM) $@
- @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID10PARTICLE)"!=""
-
.IF "$(SDI10TARGET)"!=""
$(SDI10TARGET): $(SVSDI10DEPEND) $(SDI10NAME).sdi
@echo "Making: " $(@:f)
diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
index 228e8867df09..375fab35b800 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -4,7 +4,7 @@
$(MISC)/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST)
-$(MISC)/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
+$(MISC)/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES)
@echo "Making: " $(@:f)
@@-$(RM) $(MISC)/$(TARGET).$(SRS1NAME).dprr
$(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES)
@@ -42,22 +42,10 @@ $(SRS)/$(SRS1NAME).srs: $(SRC1FILES)
# unroll begin
.IF "$(SRS2NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID2FILES=$(foreach,i,$(SRC2FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS2NAME)_srs.hid
-$(HIDSRS2PARTICLE) : $(HID2FILES)
- @echo "Making: " $(@:f)
- @-$(RM) $@
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID2FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS2PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST)
-$(MISC)/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
+$(MISC)/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES)
@echo "Making: " $(@:f)
@@-$(RM) $(MISC)/$(TARGET).$(SRS2NAME).dprr
$(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES)
@@ -95,22 +83,10 @@ $(SRS)/$(SRS2NAME).srs: $(SRC2FILES)
# unroll begin
.IF "$(SRS3NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID3FILES=$(foreach,i,$(SRC3FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS3NAME)_srs.hid
-$(HIDSRS3PARTICLE) : $(HID3FILES)
- @echo "Making: " $(@:f)
- @-$(RM) $@
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID3FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS3PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST)
-$(MISC)/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
+$(MISC)/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES)
@echo "Making: " $(@:f)
@@-$(RM) $(MISC)/$(TARGET).$(SRS3NAME).dprr
$(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES)
@@ -148,22 +124,10 @@ $(SRS)/$(SRS3NAME).srs: $(SRC3FILES)
# unroll begin
.IF "$(SRS4NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID4FILES=$(foreach,i,$(SRC4FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS4NAME)_srs.hid
-$(HIDSRS4PARTICLE) : $(HID4FILES)
- @echo "Making: " $(@:f)
- @-$(RM) $@
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID4FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS4PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST)
-$(MISC)/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
+$(MISC)/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES)
@echo "Making: " $(@:f)
@@-$(RM) $(MISC)/$(TARGET).$(SRS4NAME).dprr
$(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES)
@@ -201,22 +165,10 @@ $(SRS)/$(SRS4NAME).srs: $(SRC4FILES)
# unroll begin
.IF "$(SRS5NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID5FILES=$(foreach,i,$(SRC5FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS5NAME)_srs.hid
-$(HIDSRS5PARTICLE) : $(HID5FILES)
- @echo "Making: " $(@:f)
- @-$(RM) $@
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID5FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS5PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST)
-$(MISC)/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
+$(MISC)/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES)
@echo "Making: " $(@:f)
@@-$(RM) $(MISC)/$(TARGET).$(SRS5NAME).dprr
$(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES)
@@ -254,22 +206,10 @@ $(SRS)/$(SRS5NAME).srs: $(SRC5FILES)
# unroll begin
.IF "$(SRS6NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID6FILES=$(foreach,i,$(SRC6FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS6NAME)_srs.hid
-$(HIDSRS6PARTICLE) : $(HID6FILES)
- @echo "Making: " $(@:f)
- @-$(RM) $@
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID6FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS6PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST)
-$(MISC)/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
+$(MISC)/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES)
@echo "Making: " $(@:f)
@@-$(RM) $(MISC)/$(TARGET).$(SRS6NAME).dprr
$(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES)
@@ -307,22 +247,10 @@ $(SRS)/$(SRS6NAME).srs: $(SRC6FILES)
# unroll begin
.IF "$(SRS7NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID7FILES=$(foreach,i,$(SRC7FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS7NAME)_srs.hid
-$(HIDSRS7PARTICLE) : $(HID7FILES)
- @echo "Making: " $(@:f)
- @-$(RM) $@
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID7FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS7PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST)
-$(MISC)/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
+$(MISC)/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES)
@echo "Making: " $(@:f)
@@-$(RM) $(MISC)/$(TARGET).$(SRS7NAME).dprr
$(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES)
@@ -360,22 +288,10 @@ $(SRS)/$(SRS7NAME).srs: $(SRC7FILES)
# unroll begin
.IF "$(SRS8NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID8FILES=$(foreach,i,$(SRC8FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS8NAME)_srs.hid
-$(HIDSRS8PARTICLE) : $(HID8FILES)
- @echo "Making: " $(@:f)
- @-$(RM) $@
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID8FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS8PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST)
-$(MISC)/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
+$(MISC)/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES)
@echo "Making: " $(@:f)
@@-$(RM) $(MISC)/$(TARGET).$(SRS8NAME).dprr
$(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES)
@@ -413,22 +329,10 @@ $(SRS)/$(SRS8NAME).srs: $(SRC8FILES)
# unroll begin
.IF "$(SRS9NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID9FILES=$(foreach,i,$(SRC9FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS9NAME)_srs.hid
-$(HIDSRS9PARTICLE) : $(HID9FILES)
- @echo "Making: " $(@:f)
- @-$(RM) $@
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID9FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS9PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST)
-$(MISC)/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
+$(MISC)/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES)
@echo "Making: " $(@:f)
@@-$(RM) $(MISC)/$(TARGET).$(SRS9NAME).dprr
$(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES)
@@ -466,22 +370,10 @@ $(SRS)/$(SRS9NAME).srs: $(SRC9FILES)
# unroll begin
.IF "$(SRS10NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID10FILES=$(foreach,i,$(SRC10FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS10NAME)_srs.hid
-$(HIDSRS10PARTICLE) : $(HID10FILES)
- @echo "Making: " $(@:f)
- @-$(RM) $@
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID10FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS10PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
$(MISC)/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST)
-$(MISC)/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
+$(MISC)/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES)
@echo "Making: " $(@:f)
@@-$(RM) $(MISC)/$(TARGET).$(SRS10NAME).dprr
$(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES)
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 7ad8fd19f33f..2155ab8842d5 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -600,7 +600,7 @@ $(MISC)/%.dpr :
.IF "$(nodep)"==""
@echo "Making: " $(@:f)
@@-$(RM) $@
- $(COMMAND_ECHO)dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) NO_HIDS=true make_srs_deps=true $(DEPSRSFILES)
+ $(COMMAND_ECHO)dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_srs_deps=true $(DEPSRSFILES)
$(COMMAND_ECHO)-$(TYPE) $(MISC)/$(TARGET).*.dprr >> $@
.ENDIF # "$(nodep)"==""
@@ -689,11 +689,6 @@ $(OUT)/ucr/$(IDLPACKAGE)/%.urd : %.idl
$(OUT)/ucrdoc/$(IDLPACKAGE)/%.urd : %.idl
@noop $(assign all_outdated_doc_idl+:=$<)
-# generate hid files
-$(SRS)/%.hid : %.src
- @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(*:f).src
- $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)/bin/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE)
-
# make *.xml descriptions available in $(MISC)
$(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml : %.xml
$(COMMAND_ECHO)$(COPY) $< $@
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index cc7f7eed4ebb..6e8007425454 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -960,31 +960,26 @@ NO_SDINAME_allowed
.IF "$(SDI1NAME)"!=""
.DIRCACHE=no
SDI1TARGET=$(MISC)/$(SDI1NAME).don
-HIDSID1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI1NAME)_sid.hid
.ENDIF
.IF "$(SDI2NAME)"!=""
.DIRCACHE=no
SDI2TARGET=$(MISC)/$(SDI2NAME).don
-HIDSID2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI2NAME)_sid.hid
.ENDIF
.IF "$(SDI3NAME)"!=""
.DIRCACHE=no
SDI3TARGET=$(MISC)/$(SDI3NAME).don
-HIDSID3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI3NAME)_sid.hid
.ENDIF
.IF "$(SDI4NAME)"!=""
.DIRCACHE=no
SDI4TARGET=$(MISC)/$(SDI4NAME).don
-HIDSID4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI4NAME)_sid.hid
.ENDIF
.IF "$(SDI5NAME)"!=""
.DIRCACHE=no
SDI5TARGET=$(MISC)/$(SDI5NAME).don
-HIDSID5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI5NAME)_sid.hid
.ENDIF
.IF "$(XMLPROPERTIES)"!=""
@@ -1045,8 +1040,6 @@ ALLTAR: \
$(DPRTARGET) \
$(DPZTARGET) \
$(ZIPALL) \
- $(HIDSID1PARTICLE) $(HIDSID2PARTICLE) \
- $(HIDSID3PARTICLE) $(HIDSID4PARTICLE) $(HIDSID5PARTICLE) \
$(SDITARGET) $(SDI1TARGET) $(SDI2TARGET) \
$(SDI3TARGET) $(SDI4TARGET) $(SDI5TARGET) \
$(XMLPROPERTIESN) \
@@ -1084,8 +1077,6 @@ ALLTAR: \
$(RESLIB3TARGETN) $(RESLIB4TARGETN) \
$(RESLIB5TARGETN) $(RESLIB6TARGETN) \
$(RESLIB7TARGETN) $(RESLIB8TARGETN) \
- $(COMMONPRJHIDOTHERTARGET) \
- $(PRJHID2TARGET) \
$(LOCALIZE_ME_DEST)\
last_target
@@ -1123,8 +1114,6 @@ ALLTAR: \
$(COMP9RDBTARGETN) \
$(IDL1TARGET) $(IDL2TARGET) $(IDL3TARGET) \
$(IDL4TARGET) $(IDL5TARGET) \
- $(HIDSID1PARTICLE) $(HIDSID2PARTICLE) \
- $(HIDSID3PARTICLE) $(HIDSID4PARTICLE) $(HIDSID5PARTICLE) \
$(SDI1TARGET) $(SDI2TARGET) $(SDI3TARGET) \
$(SDI4TARGET) $(SDI5TARGET) \
$(HXXCOPYTARGET) \
@@ -1193,8 +1182,6 @@ ALLTAR: \
$(RESLIB5TARGETN) $(RESLIB6TARGETN) \
$(RESLIB7TARGETN) $(RESLIB8TARGETN) \
$(RESLIB9TARGETN) \
- $(COMMONPRJHIDOTHERTARGET) \
- $(PRJHID2TARGET) \
$(SIGNFORNETSCAPE) \
$(SIGNFOREXPLORER) \
$(SIGNFORJARSIGNER) \
@@ -1527,22 +1514,14 @@ $(MISC)/$(TARGET)_%.done : %.xrb
@@$(RM) $(MISC)/$(<:b).interm$(TARGET)
.ENDIF # "$(XMLPROPERTIES)"!=""
-.IF "$(HIDSID1PARTICLE)$(SDI1TARGET)$(HIDSID2PARTICLE)$(SDI2TARGET)$(HIDSID3PARTICLE)$(SDI3TARGET)$(HIDSID4PARTICLE)$(SDI4TARGET)$(HIDSID5PARTICLE)$(SDI5TARGET)$(HIDSID6PARTICLE)$(SDI6TARGET)$(HIDSID7PARTICLE)$(SDI7TARGET)$(HIDSID8PARTICLE)$(SDI8TARGET)$(HIDSID9PARTICLE)$(SDI9TARGET)"!=""
+.IF "$(SDI1TARGET)$(SDI2TARGET)$(SDI3TARGET)$(SDI4TARGET)$(SDI5TARGET)$(SDI6TARGET)$(SDI7TARGET)$(SDI8TARGET)$(SDI9TARGET)"!=""
.INCLUDE : _tg_sdi.mk
-.ENDIF # "$(HIDSID1PARTICLE)$(SDI1TARGET)$(HIDSID2PARTICLE)$(SDI2TARGET)$(HIDSID3PARTICLE)$(SDI3TARGET)$(HIDSID4PARTICLE)$(SDI4TARGET)$(HIDSID5PARTICLE)$(SDI5TARGET)$(HIDSID6PARTICLE)$(SDI6TARGET)$(HIDSID7PARTICLE)$(SDI7TARGET)$(HIDSID8PARTICLE)$(SDI8TARGET)$(HIDSID9PARTICLE)$(SDI9TARGET)"!=""
+.ENDIF # "$(SDI1TARGET)$(SDI2TARGET)$(SDI3TARGET)$(SDI4TARGET)$(SDI5TARGET)$(SDI6TARGET)$(SDI7TARGET)$(SDI8TARGET)$(SDI9TARGET)"!=""
.IF "$(DEF1NAME)$(DEF2NAME)$(DEF3NAME)$(DEF4NAME)$(DEF5NAME)$(DEF6NAME)$(DEF7NAME)$(DEF8NAME)$(DEF9NAME)"!=""
.INCLUDE : _tg_def.mk
.ENDIF
-.IF "$(COMMONPRJHIDOTHERTARGET)"!=""
-$(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
- @echo "Making: " $@
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- $(COMMAND_ECHO)$(TYPE) $(PRJHIDOTHERTARGET) > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF
-
# -------
# - LIB -
# -------
@@ -2011,17 +1990,17 @@ UNOUCRDEPxxx : $(UNOUCRDEP);
.ENDIF # "$(UNOTYPES)" != ""
-#new hid.lst trigger with GEN_HID2=TRUE
-$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
- @echo "Making: " $@
- @echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp
- $(COMMAND_ECHO)$(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
- @-$(RENAME) $@.$(ROUT).tmp $@
- @-mkdir $(@:d)hid
- $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv $(FI)
- @-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv
+##new hid.lst trigger with GEN_HID2=TRUE
+#$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
+# @echo "Making: " $@
+# @echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp
+# $(COMMAND_ECHO)$(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp
+# @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+# @-$(RENAME) $@.$(ROUT).tmp $@
+# @-mkdir $(@:d)hid
+# $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp
+# @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv $(FI)
+# @-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv
.IF "$(SOLAR_JAVA)"!=""
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index 40096386c436..69721a7e2204 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -30,22 +30,6 @@
.IF "$(RESLIB$(TNR)TARGETN)"!=""
-.IF "$(BUILDHIDS)"!=""
-HIDRES$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB$(TNR)NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB$(TNR)HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB$(TNR)SRSFILES)))
-$(HIDRES$(TNR)PARTICLE): $(RESLIB$(TNR)HIDFILES)
- @echo "Making: " $(@:f)
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
- $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES$(TNR)PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
$(RSC_MULTI$(TNR)) : \
$(RESLIB$(TNR)SRSFILES) \
$(RESLIB$(TNR)TARGETN) \
diff --git a/solenv/inc/tg_sdi.mk b/solenv/inc/tg_sdi.mk
index a515fc1ed13a..66b8c89850b8 100644
--- a/solenv/inc/tg_sdi.mk
+++ b/solenv/inc/tg_sdi.mk
@@ -29,15 +29,6 @@
# instructions for ???
# unroll begin
-.IF "$(HIDSID$(TNR)PARTICLE)"!=""
-$(HIDSID$(TNR)PARTICLE): $(SDI$(TNR)TARGET)
- @echo "Making: " $(@:f)
- @-$(RM) $@.$(ROUT).tmp $@
- @$(TYPE) $(MISC)/$(SDI$(TNR)NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
- @-$(RM) $@
- @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID$(TNR)PARTICLE)"!=""
-
.IF "$(SDI$(TNR)TARGET)"!=""
$(SDI$(TNR)TARGET): $(SVSDI$(TNR)DEPEND) $(SDI$(TNR)NAME).sdi
@echo "Making: " $(@:f)
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index e7e6ddfaea88..a919069cd3cd 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -32,7 +32,7 @@
$(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST)
-$(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
+$(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES)
@echo "Making: " $(@:f)
@@-$(RM) $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr
$(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
diff --git a/soltools/HIDCompiler/hidclex.l b/soltools/HIDCompiler/hidclex.l
deleted file mode 100755
index 565e42960462..000000000000
--- a/soltools/HIDCompiler/hidclex.l
+++ /dev/null
@@ -1,951 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-%{
-// Suppress any warnings from generated code:
-#if defined __GNUC__
-#pragma GCC system_header
-#elif defined __SUNPRO_CC
-#pragma disable_warn
-#elif defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-
-static char const Revision[] = "$Revision: 1.9 $" ;
-
-/*
-
-XX XX XXXX XXXXXX
-XX XX XX XX XX
-XX XX XX XX XX
-XXXXXX XX XX XX
-XX XX XX XX XX
-XX XX XX XX XX
-XX XX XXXX XXXXXX
-
-
- XXXX XX XXX
- XX XX XX
-XX XXXX XXX XX XX XXX XXX XX XXXXX XX XXX
-XX XX XX XX X XX XX XX XX XX XX X XXX XX
-XX X XX XX XX X XX XX XX XX XX XXXXXXX XX
- XX XX XX XX XX XX XXXXX XX XX XX XX
- XXXX XXXX XXX XXX XX XXXX XXXX XXXXX XXXX
- XXXX
-
-*/
-
-
-/* length of buffer for reading with lex */
-/**/
-/* enlarge token buffer to tokenize whole strings */
-#undef YYLMAX
-#define YYLMAX 64000
-
-int exclude_bracelevel=0; /* count braces in that start state */
-static YY_BUFFER_STATE InputFiles[127]; // for recursive parse
-static int nInputFileDepth = 0;
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <ctype.h>
-
-int alloc_cnt = 0;
-static bool bVerbose = false;
-void freestring( char const * ); //forward
-
-char* dot2underline( char* str )
-{
- size_t len=strlen(str);
- for( size_t i=0; i<len; i++ )
- if( str[i]=='.' ) str[i]='_';
- return str;
-}
-
-void dotappend( char*& base, char const * suffix )
-{
- // append like "str.suffix" if suffix else "str"
-
- if( suffix == NULL )
- return ;
-
- size_t siz;
- if( (siz=strlen(suffix)) == 0 )
- return ;
-
- size_t siz2 = base==NULL ? 0 : strlen(base);
-
- char* newstr;
-
- {//do never forget to increment/decrement alloc_cnt
- newstr = (char*) malloc( (siz2+siz+1) +1 /*for "." */ );
- alloc_cnt++;
- }
-
- if( newstr == NULL )
- fprintf( stderr,"error: dotappend() could not malloc() \n"), exit(1);
-
- if( base ) {
- strcpy( newstr, base );
- freestring( base );
- }
- else
- newstr[0] = '\0';
-
- strcat( newstr, "." );
- strcat( newstr, suffix );
- base = newstr;
-}
-
-void dotsubtract( char*& base, char const * suffix )
-{
- // remove dotted suffix from base.suffix --> base
-
- if( base == NULL || suffix == NULL )
- return;
- if( strlen(suffix) == 0 )
- return;
- if( (strlen(suffix)+1) > strlen(base) )
- return;
- char * pos=strstr( base, suffix);
- if( pos && (pos-1 >= base) && ( *(pos-1) == '.') )
- if( *(pos+strlen(suffix)) == '\0' ) //only if at end of base
- *(pos-1)= '\0';
- return;
-}
-
-int level = 0;
-char levelbuffer[512];
-
-void adjust_levelbuffer()
-{
- int i;
- for(i=0; i<level;i++) {
- levelbuffer[i] = '\t';
- }
- levelbuffer[i] = '\0';
-}
-
-void freestring( char const * ptr )
-{
- alloc_cnt--;
- adjust_levelbuffer();
- if ( bVerbose )
- fprintf(stdout,"%sinfo: freestring line %d\n",levelbuffer, __LINE__);
- free(const_cast< char * >(ptr)), ptr = NULL;
-}
-
-void makestring(char** newstr, char* oldstr)
-{
- alloc_cnt++;
- adjust_levelbuffer();
- if ( bVerbose )
- fprintf(stdout,"%sinfo: makestring on line %d\n",levelbuffer,__LINE__);
- strcpy( (*newstr=(char*)malloc(strlen(oldstr)+1)), oldstr);
- if( *newstr==NULL ) {
- fprintf( stderr,
- "error: cannot malloc for makestring() alloc_cnt==%d \n", alloc_cnt);
- exit(1);
- }
-}
-
-#ifndef WNT
-int strcmpi(char const * stra, char const * strb)
-{
- // like strcmp() but case insensitive
- size_t i;
- char a,b;
- for(i=0; ;i++){
- a = (char) tolower(stra[i]);
- b = (char) tolower(strb[i]);
- if( a < b )
- return -1;
- if( a > b )
- return 1;
- if( a == '\0' && b == '\0' )
- return 0;
- }
-}
-#endif
-
-/* variables for listfile ( with project + pathname of src file ) */
-char* listfilename;
-#define MAXSRCFILES 2048
-char* filename_tab[MAXSRCFILES];
-char* project_tab[MAXSRCFILES];
-int tab_entries = 0;
-//int fileno = 0; /* currently used filenumber */
-
-/* globale variablen */
-FILE* outfile;
-char const *filename = ""; //incl. path
-//char *basename = "";
-char const *project = "";
-char const *subpath = ""; //from project name downwards like source\ui\xxx.src
-
-int firstprint = 1;
-
-int in_define = 0;
-
-class ident_ring
-{
- #define MAXRING 2
- //nicht aendern wg externer Abfrage ->size() == 2
-
- char* ring[MAXRING];
- int ringpos;
- int last;
- int broken;
-public:
- ident_ring() {
- last = ringpos = -1;
- for(int i=0; i<MAXRING;i++)
- ring[i]=NULL;
- broken = 0;
- }
-
- void set_zero() {
- last = ringpos = -1;
- for(int i=0; i<MAXRING;i++) {
- if( ring[i] != NULL )
- freestring( ring[i] );
- ring[i]=NULL;
- }
- broken = 0;
- }
- void set_broken() { broken = 1; }
- int size() {
- if( ringpos == -1 )
- return 0;
-
- if( broken) {
- if( ringpos==0 )
- return 0;
- else
- return 1;
- } else {
- if( ringpos==0 )
- return 1;
- else
- return 2;
- }
- }
-
- char* extract_last(){
- if( last == -1 ) {
- return NULL;
- } else {
- char* ttt=ring[last];
- ring[last]=NULL;
- return ttt;
- }
- }
-
- char* extract_actual() {
- if(ringpos == -1) {
- return NULL;
- } else {
- char *ttt=ring[ringpos];
- ring[ringpos]=NULL;
- return ttt;
- }
- }
-
- void set(char* id) {
- ringpos= (++ringpos) % MAXRING;
- if( ring[ringpos] != NULL )
- freestring( ring[ringpos] ); /*otherwise: memory lost*/
- ring[ ringpos ] = id;
- if ( bVerbose )
- fprintf(stdout,
- "info: ring[%d] == %s broken==%d \n"
- ,ringpos,ring[ringpos],broken
- );
-
- if( !(ringpos==0 && last==-1) )
- last = (++last) % MAXRING;
- }
-};
-
-
-/* Notnagel: die letzten identifier/number merken, fuer klasse & globalID */
-ident_ring *ring;
-
-//
-typedef int token;
-//
-#define TOK_SEMICOLON ';'
-#define TOK_EQUAL '='
-#define TOK_OPENBRACKET '['
-#define TOK_CLOSEBRACKET ']'
-#define TOK_OPENBRACE '{'
-#define TOK_CLOSEBRACE '}'
-#define TOK_KOMMA ','
-#define TOK_LESS '<'
-#define TOK_GREATER '>'
-#define TOK_OPENPAREN '('
-#define TOK_CLOSEPAREN ')'
-#define TOK_PLUS '+'
-#define TOK_MINUS '-'
-#define TOK_STAR '*'
-#define TOK_SLASH '/'
-//
-#define TOK_POSorSIZE 146
-#define TOK_POSSIZE 147
-#define TOK_TEXTTAG 148
-#define TOK_IDNUM 149
-//
-#define TOK_EXTRADATA 151
-#define TOK_TEXT 152
-#define TOK_MESSAGE 153
-#define TOK_HELPTEXT 154
-#define TOK_TRUE 155
-#define TOK_FALSE 156
-//
-#define TOK_RESID 180
-//
-#define TOK_STRING 190
-//
-#define TOK_INVALID (-1)
-
-token lasttoken = TOK_INVALID;
-
-
-
-
-#define UNDEF (-1)
-
-char *globalID = const_cast< char * >("");
-char const *globalKLASSE = NULL;
-
-void reset_globalID() {
- //
- if( globalID && (strlen(globalID) > 0 ) ) {
- freestring( globalID );
- globalID = const_cast< char * >("");
- }
-}
-
-
-//--------------------------------------------------------------------
-class resource
-{
-private:
- resource ( const resource& ); //copy-ctor soll keiner benutzen
- void operator=( const resource& ); // zuweisung auch nicht
-public:
- resource();
- ~resource();
-public:
- int lineno;
- token lasttoken; //before opening {
- char const *klasse ;
- char *localID;
- char *helpID;
- int residfound;
-};
-
-resource *ares ; /* aktuell bearbeitete resource */
-
-resource::~resource()
-{
- if( klasse != NULL ) freestring(klasse);
- if( localID != NULL ) freestring(localID);
- if( helpID != NULL ) freestring(helpID);
-
-}
-
-resource::resource()
-{
- lineno = UNDEF;
- lasttoken= TOK_INVALID;
- klasse = NULL ;
- localID = NULL ;
- helpID = NULL ;
- residfound= 0;
-}
-
-int residfound = 0; // "Identifier = " auf momentanem level gefunden
-
-#define MAXSTACK 32
-resource* stack[MAXSTACK]; /* resource stack */
-#define EMPTYSTACK (-1)
-int stackptr = EMPTYSTACK;
-
-void push_resource( resource* r )
-{
- stackptr++;
- if( stackptr >= MAXSTACK ) {
- fprintf( stderr, "error: resource stack is full %d \n", stackptr);
- exit(1);
- }
- stack[ stackptr ] = r;
-}
-
-resource* pop_resource()
-{
- if( stackptr < 0 ) {
- fprintf( stderr, "error: pop resource from empty stack \n");
- exit(1);
- }
- return stack[ stackptr-- ];
-}
-
-/* forward */
-int eat_comment();
-int eat_cpp_comment();
-
-/*===================================================*/
-//
-// '+' im identifier wg basic\source\classes\sb.src
-//
-// '<' im identifier wg sc subtdlg.src
-//
-// '&' im identifier wg scerror.src so2..nocode.src svxerr.src scwarngs.src
-
-
-//string (\"[^"]*\") alter einfacher string ohne "
-
-%}
-
-/* 89012 */
-%option never-interactive
-
-
-simple ([^\n\"]*)
-%p 7000
-string \"{simple}((((\\\\)*(\\\"))?){simple})*\"
-
-%x MACRO_STATE
-
-%x EXCLUDE_STATE
-resfilelist ([Ff][Ii][Ll][Ee][Ll][Ii][Ss][Tt])
-resstringlist ([Ss][Tt][Rr][Ii][Nn][Gg][Ll][Ii][Ss][Tt])
-resstring ([Ss][Tt][Rr][Ii][Nn][Gg])
-
-identifier ([a-z_A-Z]+[a-z_A-Z<+&0-9]*)
-number (([0-9]+)|(0x[0-9a-fA-F]+))
-residentifier ([Ii][Dd][Ee][Nn][Tt][Ii][Ff][Ii][Ee][Rr])
-w ([ \t\n]*)
-wspecial ([\\ \t\n]*)
-texttag (([Tt][Ii][Tt][Ll][Ee])|([Tt][Ee][Xx][Tt])|([Mm][Ee][Ss][Ss][Aa][Gg][Ee]))
-qhelptag (([Qq][Uu][Ii][Cc][Kk])?([Hh][Ee][Ll][Pp][Tt][Ee][Xx][Tt]))
-langtag ([a-zA-Z_]+)
-helptag ([Hh][Ee][Ll][Pp][Ii][Dd])
-helpid ([a-zA-Z_0-9]+)
-num2tag (([Pp][Oo][Ss])|([Ss][Ii][Zz][Ee]))
-num4tag (([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
-
-%%
-[ \t] {
- /* forget whitespace */;
- }
-
-^[ \t]*#include.*\.src[">].* {
- char NewFile[255]; //long names???
- int i, j, GetIt;
-
- GetIt = 0;
- j = 0;
- nInputFileDepth++;
-// nicht schoen aber geht...
- for (i = 0; yytext[i+1] != 0; i++)
- {
- if ( GetIt == 1 )
- {
- if ( yytext[i] == '"' || yytext[i] == '>' )
- GetIt = 0;
- else
- NewFile[j++] = yytext[i];
- }
- if ( yytext[i] == '"' || yytext[i] == '<' )
- GetIt = 1;
- }
- NewFile[j] = '\0';
- FILE* pFile = NULL;
- pFile = fopen( NewFile, "r" );
- if( pFile == NULL ) {
- fprintf( stdout, "warning: could not open inputfile %s \n", NewFile );
- // try the new *_tmpl.src version instead
- // this hack was introduced to allow localisation of included src files
- const char* sStrTmpl = "_tmpl";
- j -= 4;
- for ( i = 0 ; i <5 ; i++,j++ )
- {
- NewFile[j+5] = NewFile[j];
- NewFile[j] = sStrTmpl[i];
- }
- NewFile[j+4] = '\0';
- fprintf( stderr, "trying inputfile %s \n", NewFile );
- pFile = fopen( NewFile, "r" );
- if( pFile == NULL ) {
- fprintf( stderr, "error: could not open inputfile %s \n", NewFile );
- exit(1);
- }
- }
- InputFiles[ nInputFileDepth ] = yy_create_buffer( pFile, YY_BUF_SIZE );
- yy_switch_to_buffer( InputFiles[ nInputFileDepth ] );
-
- if ( bVerbose )
- fprintf( stdout, "%s //ATTENTION!! %s gets included here\n", yytext, NewFile );
- fprintf( outfile, "// %s //ATTENTION!! %s gets included here\n\n", yytext, NewFile );
- }
-
-^[ \t]*#include.* {
- fprintf( outfile, "%s\n\n", yytext );
- }
-
-^[ \t]*#(if|ifdef|ifndef|elif).* {
- ;
- }
-
-^[ \t]*#else {
- ;
- }
-^[ \t]*#endif {
- ;
- }
-
-^[ \t]*#(undef|error|pragma).* {
- ;
- }
-
-^[ \t]*#define {
- fprintf( outfile, "%s", yytext );
- BEGIN MACRO_STATE;
- }
-
-<INITIAL,MACRO_STATE>"/*" {
- eat_comment();
- }
-
-<INITIAL,MACRO_STATE>"//" {
- eat_cpp_comment();
- }
-
-<MACRO_STATE>\n {
- fprintf( outfile, "%s\n", yytext );
- BEGIN INITIAL;
- }
-
-<MACRO_STATE>\\\n {
- fprintf( outfile, "\\\n" );
- ;/* macro schadet nicht, koennte gebraucht werden */
- }
-
-
-<MACRO_STATE>. {
- fprintf( outfile, "%s", yytext );
- ;/* ignore all this unused input */
- }
-
-";" {ring->set_zero(); lasttoken = TOK_SEMICOLON; }
-"=" {ring->set_zero(); lasttoken = TOK_EQUAL; }
-"[" {ring->set_broken(); lasttoken = TOK_OPENBRACKET; }
-"]" {ring->set_broken(); lasttoken = TOK_CLOSEBRACKET; }
-
-
-<EXCLUDE_STATE>"{" {
- exclude_bracelevel += 1;
- if ( bVerbose )
- fprintf( stdout,"info: lev %d : found {\n", exclude_bracelevel );
- }
-
-
-\\\n |
-"{" {
- // define continues
- // or a brace opens a block
-
- if( in_define && !strcmp(yytext,"\\\n") ) {
-
- if( in_define++ == 1 )
- ;// keep on working
- else
- goto blockend;
- }
-
- level++;
- if( ares != NULL ){
- if( level > 1 )
- dotappend( globalID, ares->localID );
- ares->residfound = residfound;
- push_resource( ares );
- }
- ares = new resource;
-
- residfound = 0;
- ares->residfound = 0;
-
- ares->lineno = yylineno;
- ares->lasttoken = lasttoken;
- if( ring->size() == 2 ) {
- ares->klasse = ring->extract_last();
- ares->localID = ring->extract_actual();
- } else if(ring->size() == 1) {
- ares->klasse = ring->extract_actual();
- }
- if( level==1 ){ //Ausnahme: Resource auf Ebene 1
- globalID= ares->localID;
- ares->localID = NULL;
- globalKLASSE= ares->klasse;
- }
-
- if ( bVerbose )
- fprintf(stdout,"info: { level: %d\n", level);
-
- lasttoken = TOK_OPENBRACE;
- ring->set_zero();
- }
-
-<EXCLUDE_STATE>"}" {
- //-----------------------------
- exclude_bracelevel -= 1;
- if ( bVerbose )
- fprintf( stdout,"info: lev %d : found }\n", exclude_bracelevel );
- if( exclude_bracelevel==1 ) {
- BEGIN INITIAL;
- exclude_bracelevel=0;
- }
- }
-
-
-\n |
-"}" {
- if ( bVerbose )
- fprintf(stdout,"info: } level: %d\n",level);
-
- if( !strcmp(yytext,"}") )
- ;
- else if( in_define && (!strcmp(yytext,"\n") )) {
- if( in_define==1 ) {
- //no continuation line for #define
- in_define=0;
- goto blockend;
- }
- else {
- //there was a continuation line for #define
- in_define=0;
- }
- }
- else
- goto blockend;
-
- // ares ausgeben
- if( ares != NULL ) {
-
- #define LEER "leer"
- char const * globklasse =
- globalKLASSE==NULL ? LEER:globalKLASSE;
- char const * local =
- ares->localID==NULL ? LEER:ares->localID;
- char const * klasse =
- ares->klasse==NULL ? LEER:ares->klasse;
- char const * glob =
- globalID==NULL ? LEER:globalID;
-
-
- //wg. Starview-Klasse String in ehdl.c und doc.c
- // wenn generierte C++-Quellen compiliert werden
- //
- //if( !strcmp(globklasse,"String" )) globklasse = "string";
- //if( !strcmp(klasse,"String" )) klasse = "string";
-
-
- //---------------------------------------------------
- // generate the body of a new C main program,
- // which is filled with printf statements
- // to compute (via preproseccor & compiler)
- // the codenumbers for resource names like menu$RID_SVX$xyz
-
- if( firstprint ) {
- firstprint=0;
- fprintf(outfile, "#include \"starview.hid\" \n\n");
- fprintf(outfile, " int main() { \n\n\n");
- }
-
- char globunder[256];
- strcpy(globunder,glob);
- dot2underline( globunder );
- char const * globsuffix = strrchr(glob,'.');
- globsuffix = globsuffix==NULL ? glob:globsuffix+1;
-
- if( ares->helpID ) {
- fprintf( outfile,"\n\t printf(\"%s \\t %cs %cs \\n\",\n",
- ares->helpID,'%','%');
- fprintf(outfile,"\t\"HelpID\", (%s) ); \n", ares->helpID);
- }
- else if( ares->localID ) {
- fprintf( outfile,"\n\t printf(\"%s:%s:%s:%s \\t %cs %cu %cs %cu \\n\",\n",
- project,klasse,globunder,local,'%','%','%','%');
- fprintf( outfile,"\t\"Norm %s\", (%s), \"%s\", (%s) );\n",
- globklasse,globsuffix, klasse,local);
- }
- else if( (strcmpi("MenuItem",klasse)==0) ||
- (strcmpi("ToolBoxItem",klasse)==0) ) {
- ; //no output (99% is a separator)
- }
- else {
- fprintf( outfile,"\n\t printf(\"%s:%s:%s \\t %cs %cu %cs \\n\",\n",
- project,klasse,globunder,'%','%','%');
- fprintf( outfile,"\t\"Norm %s\", (%s), \"%s\" );\n",
- globklasse,globsuffix, klasse);
- }
-
- delete ares;
- }
-
-
- // ein level zurueck
- if( level == 1) {
- reset_globalID();
- globalKLASSE = NULL;
- }
- level--;
- ares = pop_resource();
- residfound = ares->residfound;
- dotsubtract( globalID, ares->localID );
-
-
- //
- lasttoken = TOK_CLOSEBRACE;
- ring->set_zero();
- blockend: ;
- }
-
-"," {ring->set_broken(); lasttoken = TOK_KOMMA; }
-
-"<" {ring->set_broken(); lasttoken = TOK_LESS; }
-">" {ring->set_broken(); lasttoken = TOK_GREATER; }
-
-"(" {ring->set_broken(); lasttoken = TOK_OPENPAREN; }
-")" {ring->set_broken(); lasttoken = TOK_CLOSEPAREN; }
-"+" {ring->set_broken(); lasttoken = TOK_PLUS; }
-"-" {ring->set_broken(); lasttoken = TOK_MINUS; }
-"*" {ring->set_broken(); lasttoken = TOK_STAR; }
-"/" {ring->set_broken(); lasttoken = TOK_SLASH; }
-
-
-{helptag}{w}"="{w}{helpid}{w}";" {
-
- // extract text for helpid and put to ares
- char* pos = strchr(yytext,'=');
- size_t offset = strspn(pos+1," \t\n");
- char* start = pos+1+offset;
- size_t offset2= strcspn( start, "; \t\n");
- char* end = start+offset2;
- *end = '\0';
- char *helpid;
- makestring( &helpid, start );
- ares->helpID = helpid;
- }
-
-{residentifier}{w}"="[ \t\n]*({identifier}|{number}) {
- ring->set_zero();
- lasttoken = TOK_RESID;
- residfound=1;
-
- //extract resource id and store as localID
- char *after = strrchr(yytext,'=');
- char *resid = after + strspn(after,"= \t\n");
- char *localID;
- makestring( &localID, resid );
- ares->localID = localID;
- }
-
-{resfilelist} |
-{resstring} |
-{resstringlist} {
- BEGIN EXCLUDE_STATE;
- exclude_bracelevel = 1;
- if ( bVerbose )
- fprintf( stdout,"info: lev %d : found exclusion\n", exclude_bracelevel );
- }
-
-^[ \t]*#define |
-{number} |
-{identifier} {
- /* identifier/number in einem ring ablegen */
- char *identifier;
- char *def=strstr(yytext,"#define");
- if( def ) {
- in_define = 1;
- makestring( &identifier, def+1 );
- }
- else
- makestring( &identifier, yytext );
- ring->set( identifier );
- lasttoken = TOK_IDNUM;
-
- }
-<INITIAL,EXCLUDE_STATE>{string} {
- ring->set_broken();
- lasttoken = TOK_STRING;
- if ( bVerbose )
- fprintf(stdout, "%6s %11s %8d %s \n",project,filename,yylineno, yytext);
- }
-
-
-<INITIAL,EXCLUDE_STATE>. { if ( bVerbose ) fprintf( stdout,"warning: unused input on line %d of %s \n%s\n",
- yylineno, filename, yytext);
- }
-
-<EXCLUDE_STATE>\n {
- ; //do nothing, ignore
- }
-
-
-%%
-
-
-void makeversion( char* version )
-{
- char const *pos = strpbrk( Revision, "0123456789." );
- size_t siz = strspn( pos, "0123456789." );
- if( pos && siz ) {
- strncpy(version, pos, siz);
- strcat( version, " ");
- }
- else
- strcpy( version," unknown " );
-}
-
-int main( int argc, char* argv[] )
-{
- static char const *Compiler = "HID-Compiler ";
- static char const *Author = "OG ";
- static char HIDCompiler[100];
- static char Version[100];
-
- // check for switches given on the command line
- if ( ( argc > 0 ) && ( 0 == strcmp( argv[0], "-verbose" ) ) )
- {
- bVerbose = true;
- for ( size_t i=0; i<argc-1; ++i )
- {
- argv[i] = argv[i+1];
- --argc;
- }
- }
-
- makeversion( Version );
- strcpy( HIDCompiler, Compiler );
- strcat( HIDCompiler, Version );
- strcat( HIDCompiler, Author );
- if ( bVerbose )
- fprintf( stdout, "\n %s \n\n", HIDCompiler);
- if(argc < 4) {
- fprintf(
- stderr,
- "usage: hidc [-verbose] file.src file.c project\n"
- "\n"
- "You must give exactly 3 arguments.\n"
- "1 - an existing SRC file.\n"
- "2 - C file to be generated (which generates the HID file when run).\n"
- "3 - the project name (an arbitrary name).\n\n"
- );
- exit(1);
- }
-
- project = argv[3];
-
- char *outfilename = argv[2];
- if( (outfile=fopen( outfilename , "w" )) ==NULL ) {
- fprintf(stderr,"error: could not open outputfile '%s' \n", outfilename);
- exit(1);
- }
-
- filename = argv[1];
- nInputFileDepth = 0;
- FILE* pFile;
- pFile = fopen( filename, "r" );
- if( pFile == NULL ) {
- fprintf( stderr, "error: could not open inputfile %s \n", filename );
- exit(1);
- }
- InputFiles[ nInputFileDepth ] = yy_create_buffer( pFile, YY_BUF_SIZE );
- yy_switch_to_buffer( InputFiles[ nInputFileDepth ] );
- ring = new ident_ring;
- ares = new resource;
-
- fprintf(outfile, "/* Generated from %s */\n\n", HIDCompiler );
- fprintf(outfile, "/* Source was: %s */\n", filename );
-
- yylineno = 1;
- yylex(); /* do the real work here */
-
- if( firstprint ) {
- fprintf(outfile, "#include \"starview.hid\" \n\n");
- fprintf(outfile, " int main() { \n\n\n");
- }
- fprintf(outfile, "\nreturn 0;");
- fprintf(outfile, "\n} /*main*/\n");
- return 0;
-}
-
-int yywrap()
-{
- yy_delete_buffer( InputFiles[ nInputFileDepth ] );
- if ( nInputFileDepth == 0 )
- return 1;/* keine src files mehr */
- else
- {
- nInputFileDepth--;
- fprintf(outfile, "// Done reading file\n\n");
- yy_switch_to_buffer( InputFiles[ nInputFileDepth ] );
- return 0;
- }
-}
-
-int eat_comment()
-{
- int c;
- int lastc = ' ';
- while( (c=yyinput()) != EOF ) {
- if( c=='\n')
- ;
- else if( c=='/' && lastc=='*' )
- break; /* end of comment found */
- lastc=c;
- }
- return 0;
-}
-
-int eat_cpp_comment()
-{
- int c;
- while( (c=yyinput()) != EOF ) {
- if( c=='\n') {
- break;
- }
- }
- if( c != EOF )
- unput(c); /* because next #.... line was not found */
- return 0;
-}
diff --git a/soltools/HIDCompiler/makefile.mk b/soltools/HIDCompiler/makefile.mk
deleted file mode 100644
index 8c65fc09cd21..000000000000
--- a/soltools/HIDCompiler/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=soltools
-TARGET=hidc
-TARGETTYPE=CUI
-LIBTARGET=no
-NO_DEFAULT_STL=TRUE
-INCPRE=$(MISC)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE : settings.mk
-.INCLUDE : libs.mk
-CDEFS+= -DYY_NEVER_INTERACTIVE=1
-
-UWINAPILIB=$(0)
-
-# --- Files --------------------------------------------------------
-
-# HID compiler
-APP1TARGET= $(TARGET)
-APP1OBJS= $(OBJ)$/wrap_hidclex.obj
-APP1DEPN= $(OBJ)$/wrap_hidclex.obj
-APP1LIBSALCPPRT=
-
-DEPOBJFILES=$(APP1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(MISC)$/%_yy.cxx : %lex.l
- flex -l -8 -o$@ $<
-
-$(OBJ)$/wrap_hidclex.obj: $(MISC)$/hidc_yy.cxx
diff --git a/soltools/HIDCompiler/wrap_hidclex.cxx b/soltools/HIDCompiler/wrap_hidclex.cxx
deleted file mode 100644
index 1eb79e80a5da..000000000000
--- a/soltools/HIDCompiler/wrap_hidclex.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-
-#include "hidc_yy.cxx"
diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst
index 73611addf782..578723b0e09d 100644
--- a/soltools/prj/build.lst
+++ b/soltools/prj/build.lst
@@ -10,5 +10,4 @@ so soltools\javadep nmake - all so_jvdep so_mkdep so_adjvis.u NULL
so soltools\support nmake - all so_supp so_mkdep so_adjvis.u NULL
so soltools\giparser nmake - all so_gip so_supp so_adjvis.u NULL
so soltools\adjustvisibility nmake - u so_adjvis so_mkdep NULL
-so soltools\HIDCompiler nmake - all so_hidc so_mkdep so_adjvis.u so_wunistd.n NULL
so soltools\testhxx nmake - all so_testhxx so_mkdep NULL
diff --git a/soltools/prj/d.lst b/soltools/prj/d.lst
index ee3ae5e2f907..970805f5d60c 100644
--- a/soltools/prj/d.lst
+++ b/soltools/prj/d.lst
@@ -8,6 +8,4 @@
..\%__SRC%\bin\cpp.exe %_DEST%\bin%_EXT%\cpplcc.exe
..\%__SRC%\bin\cpp %_DEST%\bin%_EXT%\cpp.lcc
..\%__SRC%\inc\unistd.h %_DEST%\inc%_EXT%\unistd.h
-..\%__SRC%\bin\hidc.exe %_DEST%\bin%_EXT%\hidc.exe
-..\%__SRC%\bin\hidc %_DEST%\bin%_EXT%\hidc
..\%__SRC%\bin\testhxx* %_DEST%\bin%_EXT%\testhxx*
generated by cgit (git 2.34.1) at 2025-01-22 19:47:42 +0000