Attachment #56235 for bug #42465

View | Details | Raw Unified | Return to bug 42465 | Differences between

and this patch




#ifndef RTE_SYSTEMLINUX_H
#define RTE_SYSTEMLINUX_H

#if defined(__cplusplus)
extern "C" 
#endif

/*!
   Own coroutine context used only if a assembly coroutine switch code exists
 */

    void (*addr)() ;  /*!< Initial entry address */
};

#if defined(__cplusplus)
extern "C" 
#endif

/*!
  @brief Implementation of own context setup interface





use Getopt::Std;
use File::Copy;

#my @doxygendirs = ("$ENV{OWN}/tool/bin/", "$ENV{TOOL}/pgm/", "");
my @doxygendirs = ("/usr/bin/", "$ENV{OWN}/tool/bin/", "$ENV{TOOL}/pgm/", "");
my $dotexe=".exe" if($^O=~/.*win32.*/i);
my $doxygen;
my $doxyver="1.3-rc2";

my $found=0;
my $versionok=0;
foreach my $dir (@doxygendirs) {
#    $doxygen="${dir}doxygen$dotexe";
    $doxygen="${dir}doxygen";
    if (-x "$doxygen") {
        $found=1;
#        if (checkDoxygenVersion($doxygen, $doxyver)) {
            $versionok=1;
            last;
#        }
    }
}
if (!$found) {

    exit 1;
}

#my $infile = "$opt_dir/tree.js";
#my $outfile = "$opt_dir/tree.js.tmp";
#open(FILE_IN, "<$infile") || die "Can't open '$infile' (input): $!";
#open(FILE_OUT, ">$outfile")  || die "Can't open '$outfile' (output): $!";
#my $firstline=1;
#while(<FILE_IN>) {
##
##   Skip if already modified
##
#    if ($_=~/\/\/ tree.js modified by genSQLDBCdoc/) {
#        exit 0;
#    }
#    if ($firstline) {
#        print  FILE_OUT "// tree.js modified by genSQLDBCdoc\n";
#        $firstline=0;
#    }
##
##   Insert link for Native C Reference
##
#    if ($_=~/\s+insDoc\(.*\"SQLDBC_C.h\".*\"(SQLDBC__C.*)\".*/){
#        $sqldbc_c_ref = $1;
#    }
#    if ($_=~/\s+insDoc\(.*\"Compound Members\".*/){
#        print  FILE_OUT "insDoc(foldersTree, gLnk(\"Native C Reference\", \"\", \"$sqldbc_c_ref\"))\n";
#    }	      
##
##   Insert Installation chapter
##
#    if ($_=~/\s+insDoc\(.*\"SQL Database Connectivity.*\".*/){
#        print FILE_OUT $_;
#        print FILE_OUT "insDoc(foldersTree, gLnk(\"Installation\", \"\", \"install.html\"))\n";
#        next;
#    }	          
#    print FILE_OUT $_;
#}

chdir("$ENV{OWN}/usr");


Return to bug 42465

Lines 39-46 use Getopt::Long; Link Here

(-)V75_00_24/MaxDB_ORG/sys/src/SAPDB/Interfaces/SQLDBC/genSQLDBCdoc.pl.ori (-40 / +41 lines)
39	use Getopt::Std;	39	use Getopt::Std;
40	use File::Copy;	40	use File::Copy;
41		41
42	my @doxygendirs = ("$ENV{OWN}/tool/bin/", "$ENV{TOOL}/pgm/", "");	42	#my @doxygendirs = ("$ENV{OWN}/tool/bin/", "$ENV{TOOL}/pgm/", "");
43		43	my @doxygendirs = ("/usr/bin/", "$ENV{OWN}/tool/bin/", "$ENV{TOOL}/pgm/", "");
44	my $dotexe=".exe" if($^O=~/.win32./i);	44	my $dotexe=".exe" if($^O=~/.win32./i);
45	my $doxygen;	45	my $doxygen;
46	my $doxyver="1.3-rc2";	46	my $doxyver="1.3-rc2";
Lines 62-74 if (-d "$opt_dir") { Link Here
62	my $found=0;	62	my $found=0;
63	my $versionok=0;	63	my $versionok=0;
64	foreach my $dir (@doxygendirs) {	64	foreach my $dir (@doxygendirs) {
65	$doxygen="${dir}doxygen$dotexe";	65	# $doxygen="${dir}doxygen$dotexe";
		66	$doxygen="${dir}doxygen";
66	if (-x "$doxygen") {	67	if (-x "$doxygen") {
67	$found=1;	68	$found=1;
68	if (checkDoxygenVersion($doxygen, $doxyver)) {	69	# if (checkDoxygenVersion($doxygen, $doxyver)) {
69	$versionok=1;	70	$versionok=1;
70	last;	71	last;
71	}	72	# }
72	}	73	}
73	}	74	}
74	if (!$found) {	75	if (!$found) {
Lines 95-135 if(system($cmd)) { Link Here
95	exit 1;	96	exit 1;
96	}	97	}
97		98
98	my $infile = "$opt_dir/tree.js";	99	#my $infile = "$opt_dir/tree.js";
99	my $outfile = "$opt_dir/tree.js.tmp";	100	#my $outfile = "$opt_dir/tree.js.tmp";
100	open(FILE_IN, "<$infile") \|\| die "Can't open '$infile' (input): $!";	101	#open(FILE_IN, "<$infile") \|\| die "Can't open '$infile' (input): $!";
101	open(FILE_OUT, ">$outfile") \|\| die "Can't open '$outfile' (output): $!";	102	#open(FILE_OUT, ">$outfile") \|\| die "Can't open '$outfile' (output): $!";
102	my $firstline=1;	103	#my $firstline=1;
103	while(<FILE_IN>) {	104	#while(<FILE_IN>) {
104	#	105	##
105	# Skip if already modified	106	## Skip if already modified
106	#	107	##
107	if ($_=~/\/\/ tree.js modified by genSQLDBCdoc/) {	108	# if ($_=~/\/\/ tree.js modified by genSQLDBCdoc/) {
108	exit 0;	109	# exit 0;
109	}	110	# }
110	if ($firstline) {	111	# if ($firstline) {
111	print FILE_OUT "// tree.js modified by genSQLDBCdoc\n";	112	# print FILE_OUT "// tree.js modified by genSQLDBCdoc\n";
112	$firstline=0;	113	# $firstline=0;
113	}	114	# }
114	#	115	##
115	# Insert link for Native C Reference	116	## Insert link for Native C Reference
116	#	117	##
117	if ($_=~/\s+insDoc\(.\"SQLDBC_C.h\".\"(SQLDBC__C.)\"./){	118	# if ($_=~/\s+insDoc\(.\"SQLDBC_C.h\".\"(SQLDBC__C.)\"./){
118	$sqldbc_c_ref = $1;	119	# $sqldbc_c_ref = $1;
119	}	120	# }
120	if ($_=~/\s+insDoc\(.\"Compound Members\"./){	121	# if ($_=~/\s+insDoc\(.\"Compound Members\"./){
121	print FILE_OUT "insDoc(foldersTree, gLnk(\"Native C Reference\", \"\", \"$sqldbc_c_ref\"))\n";	122	# print FILE_OUT "insDoc(foldersTree, gLnk(\"Native C Reference\", \"\", \"$sqldbc_c_ref\"))\n";
122	}	123	# }
123	#	124	##
124	# Insert Installation chapter	125	## Insert Installation chapter
125	#	126	##
126	if ($_=~/\s+insDoc\(.\"SQL Database Connectivity.\".*/){	127	# if ($_=~/\s+insDoc\(.\"SQL Database Connectivity.\".*/){
127	print FILE_OUT $_;	128	# print FILE_OUT $_;
128	print FILE_OUT "insDoc(foldersTree, gLnk(\"Installation\", \"\", \"install.html\"))\n";	129	# print FILE_OUT "insDoc(foldersTree, gLnk(\"Installation\", \"\", \"install.html\"))\n";
129	next;	130	# next;
130	}	131	# }
131	print FILE_OUT $_;	132	# print FILE_OUT $_;
132	}	133	#}
133		134
134	chdir("$ENV{OWN}/usr");	135	chdir("$ENV{OWN}/usr");
135		136

Lines 32-41 Link Here

(-)V75_00_24/MaxDB_ORG/sys/src/SAPDB/RunTime/RTE_SystemLinux.h.orig (-4 / +4 lines)
32	#ifndef RTE_SYSTEMLINUX_H	32	#ifndef RTE_SYSTEMLINUX_H
33	#define RTE_SYSTEMLINUX_H	33	#define RTE_SYSTEMLINUX_H
34		34
35	#if defined(__cplusplus)
36	extern "C"
37	#endif
38
39	/*!	35	/*!
40	Own coroutine context used only if a assembly coroutine switch code exists	36	Own coroutine context used only if a assembly coroutine switch code exists
41	*/	37	*/
Lines 45-50 struct RTE_OwnCoroutineContext Link Here
45	void (addr)() ; /!< Initial entry address */	41	void (addr)() ; /!< Initial entry address */
46	};	42	};
47		43
		44	#if defined(__cplusplus)
		45	extern "C"
		46	#endif
		47
48	/*!	48	/*!
49	@brief Implementation of own context setup interface	49	@brief Implementation of own context setup interface
50		50