Menu
▾
▴
eas-dev-commit — Commit Log
You can subscribe to this list here.
| 2003 |
Jan
(69) |
Feb
(122) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
|
Mar
(56) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(237) |
Jul
|
Aug
|
Sep
(1) |
Oct
(14) |
Nov
(72) |
Dec
|
| 2007 |
Jan
(2) |
Feb
(37) |
Mar
(5) |
Apr
|
May
(2) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:30:53
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv18441/libs/libsxmlstream/tests
Modified Files:
BinaryStreamTest.h TextStreamTest.h
Log Message:
mofidifed build process; changes to libsxmlstream (seems that it is still
broken); minor additions over the project
Index: BinaryStreamTest.h
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests/BinaryStreamTest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BinaryStreamTest.h 2 Feb 2003 06:59:11 -0000 1.1
+++ BinaryStreamTest.h 3 Feb 2003 06:30:49 -0000 1.2
@@ -11,6 +11,7 @@
#include <sxmlstream.hxx>
using namespace std;
+using namespace openeas::sxmlstream;
class BinaryStreamTest: public CxxTest::TestSuite
{
Index: TextStreamTest.h
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests/TextStreamTest.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- TextStreamTest.h 2 Feb 2003 06:59:11 -0000 1.4
+++ TextStreamTest.h 3 Feb 2003 06:30:50 -0000 1.5
@@ -11,6 +11,7 @@
#include <sxmlstream.hxx>
using namespace std;
+using namespace openeas::sxmlstream;
class TextStreamTest: public CxxTest::TestSuite
{
|
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:30:52
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18441/libs/libsxmlstream/src
Modified Files:
Makefile.am sxml.cxx sxmlstream.cxx
Log Message:
mofidifed build process; changes to libsxmlstream (seems that it is still
broken); minor additions over the project
Index: Makefile.am
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am 2 Feb 2003 06:59:11 -0000 1.4
+++ Makefile.am 3 Feb 2003 06:30:47 -0000 1.5
@@ -1,5 +1,6 @@
lib_LTLIBRARIES = libsxmlstream.la
-libsxmlstream_la_SOURCES = sxml.cxx sxmlstream.cxx
+libsxmlstream_la_SOURCES = sxml.cxx sxmlstream.cxx ../include/sxml.hxx \
+ ../include/sxmlstream.hxx ../include/sxmlhandler.hxx
INCLUDES = -I../include -I$(top_srcdir)
CXXFLAGS = @GLIB_CFLAGS@
libsxmlstream_la_LIBADD = @GLIB_LIBS@
Index: sxml.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxml.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sxml.cxx 2 Feb 2003 06:59:11 -0000 1.4
+++ sxml.cxx 3 Feb 2003 06:30:47 -0000 1.5
@@ -23,19 +23,26 @@
using namespace std;
+namespace openeas { namespace sxmlstream {
+
SXmlNode::SXmlNode(const SXmlNode& v)
{
type=v.type;
- *descendants = *(v.descendants);
+ if (!(v.descendants)->empty())
+ *descendants = *(v.descendants);
+ else
+ descendants = new list<SXmlNode>;
data = v.data;
}
SXmlNode& SXmlNode::operator=(const SXmlNode& v)
{
type=v.type;
- *descendants = *(v.descendants);
+ if (!(v.descendants)->empty())
+ *descendants = *(v.descendants);
+ else
+ descendants = new list<SXmlNode>;
data = v.data;
-
return *this;
}
@@ -59,5 +66,4 @@
return e;
}
-
-
+}; };
Index: sxmlstream.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxmlstream.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sxmlstream.cxx 2 Feb 2003 06:59:11 -0000 1.8
+++ sxmlstream.cxx 3 Feb 2003 06:30:47 -0000 1.9
@@ -29,6 +29,8 @@
using namespace std;
+namespace openeas { namespace sxmlstream {
+
typedef list<SXmlNode>::iterator SXmlNode_iterator;
/* SXmlStream */
@@ -168,7 +170,7 @@
SXml_BinaryOutput(os,e);
}
return os;
-};
+}
SXmlBinaryStream& operator<<(SXmlBinaryStream& s, const ostream& os)
{
@@ -261,7 +263,7 @@
SXml_TextOutput(os,e);
}
return os;
-};
+}
SXmlTextStream& operator<<(SXmlTextStream& s, const ostream& os)
{
@@ -269,3 +271,4 @@
// TODO
}
+}; };
|
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:30:51
|
Update of /cvsroot/eas-dev/eas-dev/components/gmp/src In directory sc8-pr-cvs1:/tmp/cvs-serv18441/components/gmp/src Added Files: .cvsignore Makefile.am Log Message: mofidifed build process; changes to libsxmlstream (seems that it is still broken); minor additions over the project --- NEW FILE: .cvsignore --- Makefile Makefile.in --- NEW FILE: Makefile.am --- |
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:30:51
|
Update of /cvsroot/eas-dev/eas-dev/components/gmp/idl/org/openeas/gmp
In directory sc8-pr-cvs1:/tmp/cvs-serv18441/components/gmp/idl/org/openeas/gmp
Added Files:
XEndpoint.idl
Log Message:
mofidifed build process; changes to libsxmlstream (seems that it is still
broken); minor additions over the project
--- NEW FILE: XEndpoint.idl ---
/* $Id: XEndpoint.idl,v 1.1 2003/02/03 06:30:45 yrashk Exp $ */
#ifndef _org_openeas_gmp_XEndpoint_idl_
#define _org_openeas_gmp_XEndpoint_idl_
#ifndef _com_sun_star_uno_XInterface_idl_
#include <com/sun/star/uno/XInterface.idl>
#endif
module org { module openeas { module gmp {
interface XEndpoint: com::sun::star::uno::XInterface
{
};
}; }; };
#endif
|
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:29:01
|
Update of /cvsroot/eas-dev/eas-dev/components/gmp/src In directory sc8-pr-cvs1:/tmp/cvs-serv18237/src Log Message: Directory /cvsroot/eas-dev/eas-dev/components/gmp/src added to the repository |
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:27:42
|
Update of /cvsroot/eas-dev/eas-dev/components/gmp/idl/org/openeas/gmp In directory sc8-pr-cvs1:/tmp/cvs-serv17967/gmp Log Message: Directory /cvsroot/eas-dev/eas-dev/components/gmp/idl/org/openeas/gmp added to the repository |
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:27:12
|
Update of /cvsroot/eas-dev/eas-dev/components/gmp/idl/org/openeas In directory sc8-pr-cvs1:/tmp/cvs-serv17865/openeas Log Message: Directory /cvsroot/eas-dev/eas-dev/components/gmp/idl/org/openeas added to the repository |
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:26:44
|
Update of /cvsroot/eas-dev/eas-dev/components/gmp/idl/org In directory sc8-pr-cvs1:/tmp/cvs-serv17775/org Log Message: Directory /cvsroot/eas-dev/eas-dev/components/gmp/idl/org added to the repository |
|
From: Yurii R. <yr...@us...> - 2003-02-03 06:26:21
|
Update of /cvsroot/eas-dev/eas-dev/components/gmp/idl In directory sc8-pr-cvs1:/tmp/cvs-serv17714/idl Log Message: Directory /cvsroot/eas-dev/eas-dev/components/gmp/idl added to the repository |
|
From: Yurii R. <yr...@us...> - 2003-02-03 03:49:12
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests In directory sc8-pr-cvs1:/tmp/cvs-serv11238 Modified Files: .cvsignore Log Message: added few files to ignore Index: .cvsignore =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 28 Jan 2003 04:16:26 -0000 1.1 +++ .cvsignore 3 Feb 2003 03:49:09 -0000 1.2 @@ -1,3 +1,6 @@ Makefile Makefile.in -runTests.cxx \ No newline at end of file +runTests.cxx +runTests +.deps +.libs \ No newline at end of file |
|
From: Yurii R. <yr...@us...> - 2003-02-02 06:59:15
|
Update of /cvsroot/eas-dev/eas-dev/tools/test
In directory sc8-pr-cvs1:/tmp/cvs-serv30198/tools/test
Added Files:
cxxtestgen.py
Log Message:
modified build process; moving to glib-2.2.0; pkg-config;
unstable changes to `logger' component; minor changes to libsxmlstream;
binarystream test added to libsxmlstream (both text and binary streams
are broken now); per-platform INSTALL notes
--- NEW FILE: cxxtestgen.py ---
#!/usr/bin/python
'''Usage: %s [OPTIONS] <input file(s)>
Generate test source file for CxxTest.
-o, --output=NAME Write output to file NAME
-r, --runner=CLASS Create a main() function that runs CxxTest::CLASS
--error-printer Same as --runner=ErrorPrinter
--exit-code The generated main() returns error code
-t, --template=TEMPLATE Use TEMPLATE file to generate the test runner
'''
import re
import sys
import getopt
import glob
import string
# Global variables
suites = []
suite = None
inBlock = 0
numTotalTests = 0
outputFileName = None
runner = None
templateFileName = None
haveExceptionHandling = 0
haveStandardLibrary = 0
exitCode = 0
def main():
'''The main program'''
files = parseCommandline()
scanInputFiles( files )
writeOutput()
def usage( problem = None ):
'''Print usage info and exit'''
if problem is None:
print usageString()
sys.exit(0)
else:
sys.stderr.write( usageString() )
abort( problem )
def usageString():
'''Construct program usage string'''
return __doc__ % sys.argv[0]
def abort( problem ):
'''Print error message and exit'''
sys.stderr.write( '\n' )
sys.stderr.write( problem )
sys.stderr.write( '\n\n' )
sys.exit(2)
def parseCommandline():
'''Analyze command line arguments'''
try:
options, patterns = getopt.getopt( sys.argv[1:], 'o:r:',
['output=', 'runner=', 'error-printer', 'exit-code', 'template='] )
except getopt.error, problem:
usage( problem )
setOptions( options )
return setFiles( patterns )
def setOptions( options ):
'''Set options specified on command line'''
global outputFileName, templateFileName, runner, haveStandardLibrary, exitCode
for o, a in options:
if o in ('-o', '--output'):
outputFileName = a
if o in ('t', '--template'):
templateFileName = a
if o in ('-r', '--runner'):
runner = a
if o == '--error-printer':
runner = 'ErrorPrinter'
haveStandardLibrary = 1
if o == '--exit-code':
exitCode = 1
def setFiles( patterns ):
'''Set input files specified on command line'''
files = expandWildcards( patterns )
if len(files) is 0:
usage( "No input files found" )
return files
def expandWildcards( patterns ):
'''Expand all wildcards in an array (glob)'''
fileNames = []
for pathName in patterns:
patternFiles = glob.glob( pathName )
for fileName in patternFiles:
fileNames.append( fixBackslashes( fileName ) )
return fileNames
def fixBackslashes( fileName ):
'''Convert backslashes to slashes in file name'''
return re.sub( r'\\', '/', fileName, 0 )
def scanInputFiles(files):
'''Scan all input files for test suites'''
for file in files:
scanInputFile(file)
global suites
if len(suites) is 0:
abort( 'No tests defined' )
def scanInputFile(fileName):
'''Scan single input file for test suites'''
file = open(fileName)
lineNo = 0
while 1:
line = file.readline()
if not line:
break
lineNo = lineNo + 1
scanInputLine( fileName, lineNo, line )
closeSuite()
file.close()
def scanInputLine( fileName, lineNo, line ):
'''Scan single input line for interesting stuff'''
scanLineForExceptionHandling( line )
scanLineForStandardLibrary( line )
scanLineForSuiteStart( fileName, lineNo, line )
global suite
if suite:
scanLineInsideSuite( suite, lineNo, line )
def scanLineInsideSuite( suite, lineNo, line ):
'''Analyze line which is part of a suite'''
global inBlock
if lineBelongsToSuite( suite, lineNo, line ):
scanLineForTest( suite, lineNo, line )
scanLineForCreate( suite, lineNo, line )
scanLineForDestroy( suite, lineNo, line )
def lineBelongsToSuite( suite, lineNo, line ):
'''Returns whether current line is part of the current suite.
This can be false when we are in a generated suite outside of CXXTEST_CODE() blocks
If the suite is generated, adds the line to the list of lines'''
if not suite['generated']:
return 1
global inBlock
if not inBlock:
inBlock = lineStartsBlock( line )
if inBlock:
inBlock = addLineToBlock( suite, lineNo, line )
return inBlock
std_re = re.compile( r"\b(std\s*::|using\s+namespace\s+std\b|^\s*\#\s*include\s+<[a-z0-9]+>)" )
def scanLineForStandardLibrary( line ):
'''Check if current line uses standard library'''
global haveStandardLibrary
if not haveStandardLibrary:
haveStandardLibrary = std_re.search(line) is not None
exception_re = re.compile( r"\b\(throw|try|catch|TS_ASSERT_THROWS|TS_ASSERT_THROWS_ANYTHING|TS_ASSERT_THROWS_NOTHING\)\b" )
def scanLineForExceptionHandling( line ):
'''Check if current line uses exception handling'''
global haveExceptionHandling
if not haveExceptionHandling:
haveExceptionHandling = exception_re.search(line) is not None
suite_re = re.compile( r'\bclass\s+(\w+)\s*:\s*public\s+((::)?\s*CxxTest\s*::\s*)?TestSuite\b' )
generatedSuite_re = re.compile( r'\bCXXTEST_SUITE\s*\(\s*(\w*)\s*\)\s*;' )
def scanLineForSuiteStart( fileName, lineNo, line ):
'''Check if current line starts a new test suite'''
m = suite_re.search( line )
if m:
startSuite( m.group(1), fileName, lineNo, 0 )
m = generatedSuite_re.search( line )
if m:
startSuite( m.group(1), fileName, lineNo, 1 )
def startSuite( name, file, line, generated ):
'''Start scanning a new suite'''
global suite
closeSuite()
suite = { 'name' : name,
'file' : file,
'cfile' : cstr(file),
'line' : line,
'generated' : generated,
'object' : 'suite_%s' % name,
'dclass' : 'SuiteDescription_%s' % name,
'dobject' : 'suiteDescription_%s' % name,
'testBase' : 'TestDescriptionBase_%s' % name,
'descriptions' : 'testDescriptions_%s' % name,
'tests' : [],
'lines' : [] }
def lineStartsBlock( line ):
'''Check if current line starts a new CXXTEST_CODE() block'''
return re.search( r'\bCXXTEST_CODE\s*\(', line ) is not None
test_re = re.compile( r'\bvoid\s+([Tt]est\w+)\s*\(\s*(void)?\s*\)' )
def scanLineForTest( suite, lineNo, line ):
'''Check if current line starts a test'''
m = test_re.search( line )
if m:
addTest( suite, m.group(1), lineNo )
def addTest( suite, name, line ):
'''Add a test function to the current suite'''
test = { 'name' : name,
'suite' : suite,
'class' : 'TestDescription_%s_%s' % (suite['name'], name),
'object' : 'testDescription_%s_%s' % (suite['name'], name),
'line' : line,
}
suite['tests'].append( test )
def addLineToBlock( suite, lineNo, line ):
'''Append the line to the current CXXTEST_CODE() block'''
line = fixBlockLine( suite, lineNo, line )
line = re.sub( r'^.*\{\{', '', line )
e = re.search( r'\}\}', line )
if e:
line = line[:e.start()]
suite['lines'].append( line )
return e is None
def fixBlockLine( suite, lineNo, line):
'''Change all [E]TS_ macros used in a line to _[E]TS_ macros with the correct file/line'''
return re.sub( r'\b(E?TSM?_(ASSERT[A-Z_]*|FAIL))\s*\(',
r'_\1(%s,%s,' % (suite['cfile'], lineNo),
line, 0 )
create_re = re.compile( r'\bstatic\s+\w+\s*\*\s*createSuite\s*\(\s*(void)?\s*\)' )
def scanLineForCreate( suite, lineNo, line ):
'''Check if current line defines a createSuite() function'''
if create_re.search( line ):
addSuiteCreateDestroy( suite, 'create', lineNo )
destroy_re = re.compile( r'\bstatic\s+void\s+destroySuite\s*\(\s*\w+\s*\*\s*\w*\s*\)' )
def scanLineForDestroy( suite, lineNo, line ):
'''Check if current line defines a destroySuite() function'''
if destroy_re.search( line ):
addSuiteCreateDestroy( suite, 'destroy', lineNo )
def cstr( str ):
'''Convert a string to its C representation'''
return '"' + string.replace( str, '\\', '\\\\' ) + '"'
def addSuiteCreateDestroy( suite, which, line ):
'''Add createSuite()/destroySuite() to current suite'''
if suite.has_key(which):
abort( '%s:%s: %sSuite() already declared' % ( suite['file'], str(line), which ) )
suite[which] = line
def closeSuite():
'''Close current suite and add it to the list if valid'''
global suite
if suite is not None:
if len(suite['tests']) is not 0:
verifySuite(suite)
rememberSuite(suite)
suite = None
def verifySuite(suite):
'''Verify current suite is legal'''
if suite.has_key('create') and not suite.has_key('destroy'):
abort( '%s:%s: Suite %s has createSuite() but no destroySuite()' %
(suite['file'], suite['create'], suite['name']) )
if suite.has_key('destroy') and not suite.has_key('create'):
abort( '%s:%s: Suite %s has destroySuite() but no createSuite()' %
(suite['file'], suite['destroy'], suite['name']) )
def rememberSuite(suite):
'''Add current suite to list'''
global suites
global numTotalTests
suites.append( suite )
numTotalTests = numTotalTests + len(suite['tests'])
def writeOutput():
'''Create output file'''
if templateFileName:
writeTemplateOutput()
else:
writeSimpleOutput()
def writeSimpleOutput():
'''Create output not based on template'''
output = startOutputFile()
writeHeader( output )
writeMain( output )
writeWorld( output )
output.close()
include_re = re.compile( r"\s*\#\s*include\s+<cxxtest/" )
world_re = re.compile( r"^\s*<CxxTest\s+world>\s*$" )
def writeTemplateOutput():
'''Create output based on template file'''
template = open(templateFileName)
output = startOutputFile()
while 1:
line = template.readline()
if not line:
break;
if include_re.search( line ):
writeHeader( output )
output.write( line )
elif world_re.search( line ):
writeWorld( output )
else:
output.write( line )
template.close()
output.close()
def startOutputFile():
'''Create output file and write header'''
if outputFileName is not None:
output = open( outputFileName, 'w' )
else:
output = sys.stdout
output.write( "/* Generated file, do not edit */\n\n" )
return output
wroteHeader = 0
def writeHeader( output ):
'''Write the CxxTest header (#includes and #defines)'''
global wroteHeader
if wroteHeader: return
if haveStandardLibrary:
output.write( "#ifndef CXXTEST_HAVE_STD\n" )
output.write( "#define CXXTEST_HAVE_STD\n" )
output.write( "#endif\n" )
if haveExceptionHandling:
output.write( "#ifndef CXXTEST_HAVE_EH\n" )
output.write( "#define CXXTEST_HAVE_EH\n" )
output.write( "#endif\n" )
output.write( "#define CXXTEST_RUNNING\n" )
output.write( "\n" )
output.write( "#include <cxxtest/TestListener.h>\n" )
output.write( "#include <cxxtest/CountingTracker.h>\n" )
output.write( "#include <cxxtest/TestRunner.h>\n" )
if runner:
output.write( "#include <cxxtest/%s.h>\n" % runner )
output.write( "\n" )
wroteHeader = 1
def writeMain( output ):
'''Write the main() function for the test runner'''
if runner:
output.write( 'int main() {\n' )
if exitCode:
output.write( ' return CxxTest::%s().run();\n' % runner )
else:
output.write( ' CxxTest::%s().run();\n' % runner )
output.write( ' return 0;\n' )
output.write( '}\n\n' )
wroteWorld = 0
def writeWorld( output ):
'''Write the world definitions'''
global wroteWorld
if wroteWorld: return
if not wroteHeader:
writeHeader( output )
writeSuites( output )
writeWorldDescription( output )
writeClassStatics( output )
wroteWorld = 1
def writeSuites(output):
'''Write all TestDescription's and SuiteDescription's'''
for suite in suites:
writeInclude( output, suite['file'] )
if isGenerated(suite):
generateSuite( output, suite )
if isDynamic(suite):
writeSuitePointer( output, suite )
else:
writeSuiteObject( output, suite )
writeTestDescriptionsBase( output, suite )
writeTestDescriptions( output, suite )
writeTestPointers( output, suite )
writeSuiteDescription( output, suite )
writeSuitePointers( output )
def isGenerated(suite):
'''Checks whether a suite class should be created'''
return suite['generated']
def isDynamic(suite):
'''Checks whether a suite is dynamic'''
return suite.has_key('create')
lastIncluded = ''
def writeInclude(output, file):
'''Add #include "file" statement'''
global lastIncluded
if file == lastIncluded: return
output.writelines( [ '#include "', file, '"\n\n' ] )
lastIncluded = file
def generateSuite( output, suite ):
'''Write a suite declared with CXXTEST_SUITE()'''
output.write( 'class %s : public CxxTest::TestSuite {\n' % suite['name'] )
output.write( 'public:\n' )
for line in suite['lines']:
output.write(line)
output.write( '};\n\n' )
def writeSuitePointer( output, suite ):
'''Create static suite pointer object for dynamic suites'''
output.writelines( [ "static ", suite['name'], " *", suite['object'], " = 0;\n\n" ] )
def writeSuiteObject( output, suite ):
'''Create static suite object for non-dynamic suites'''
output.writelines( [ "static ", suite['name'], " ", suite['object'], ";\n\n" ] )
def writeTestDescriptionsBase( output, suite ):
'''Write common base class for one the tests of one suite'''
output.writelines(
[ 'class ', suite['testBase'], ' : public CxxTest::TestDescription {\n',
'public:\n',
' const char *file() const { return ', suite['cfile'], '; }\n',
' const char *suiteName() const { return "', suite['name'], '"; }\n'
'};\n\n' ] )
def writeTestDescriptions( output, suite ):
'''Write all test descriptions for a suite'''
for test in suite['tests']:
writeTestDescription( output, suite, test )
def writeTestDescription( output, suite, test ):
'''Write test description object'''
output.writelines( [
'static class ', test['class'], ' : public ', suite['testBase'], ' {\n',
'public:\n',
' unsigned line() const { return ', str(test['line']), '; }\n',
' const char *testName() const { return "', test['name'], '"; }\n',
' void run() const { ', runBody( suite, test ), ' }\n',
'} ', test['object'], ';\n\n'
] )
def runBody( suite, test ):
'''Body of TestDescription::run()'''
if isDynamic(suite): return dynamicRun( suite, test )
else: return staticRun( suite, test )
def dynamicRun( suite, test ):
'''Body of TestDescription::run() for test in a dynamic suite'''
return 'if ( ' + suite['object'] + ' ) ' + suite['object'] + '->' + test['name'] + '();'
def staticRun( suite, test ):
'''Body of TestDescription::run() for test in a non-dynamic suite'''
return suite['object'] + '.' + test['name'] + '();'
def writeTestPointers( output, suite ):
'''Write array of test descripion pointers for a suite'''
output.writelines( [ 'static const CxxTest::TestDescription *', suite['descriptions'], '[] = {\n' ] )
for test in suite['tests']:
output.writelines( [ ' { &', test['object'], ' },\n' ] )
output.write( ' { &CxxTest::TestDescription::_dummy }\n' )
output.write( '};\n\n' )
def writeSuiteDescription( output, suite ):
'''Write SuiteDescription object'''
output.writelines( [
'static class %s : public CxxTest::SuiteDescription {\n' % suite['dclass'],
'public:\n',
' const char *file() const { return %s; }\n' % suite['cfile'],
' unsigned line() const { return %s; }\n' % suite['line'],
' const char *suiteName() const { return "%s"; }\n' % suite['name'],
' unsigned numTests() const { return %s; }\n' % len(suite['tests']),
' CxxTest::TestSuite *suite() const { return %s; }\n' % suiteObjectPointer( suite ),
' const CxxTest::TestDescription &testDescription( unsigned i ) const ',
'{ return *(%s[i]); }\n' % suite['descriptions'],
'} %s;\n\n' % suite['dobject']
] )
def suiteObjectPointer( suite ):
'''Return a C expression which points to the suite object'''
if isDynamic(suite):
return suite['object']
else:
return '&' + suite['object']
def writeSuitePointers( output ):
'''Write array of suite descripion pointers'''
output.write( 'static const CxxTest::SuiteDescription *suiteDescriptions_TheWorld[] = {\n' )
for suite in suites:
output.write( ' { &%s },\n' % suite['dobject'] )
output.write( ' { &CxxTest::SuiteDescription::_dummy }\n' )
output.write( '};\n\n' )
def writeWorldDescription(output):
'''Write WorldDescription object'''
output.writelines( [
'static class WorldDescription_TheWorld : public CxxTest::WorldDescription {\n',
'public:\n',
' unsigned numSuites() const { return %s; }\n' % len(suites),
' unsigned numTotalTests() const { return %s; }\n' % numTotalTests,
' const CxxTest::SuiteDescription &suiteDescription( unsigned i ) const\n',
' { return *(suiteDescriptions_TheWorld[i]); }\n',
'protected:\n' ] )
writeWorldSetUp( output )
writeWorldTearDown( output )
output.write( '} worldDescription_theWorld;\n\n' )
def writeWorldSetUp( output ):
'''Write WorldDescription::setUp()'''
output.write( ' void setUp() const {\n' )
for suite in suites:
if isDynamic(suite):
writeCreateSuite(output, suite)
output.write( ' }\n' )
def writeCreateSuite( output, suite ):
'''Write line in WorldDescription::setUp() to create a suite'''
output.writelines( [
' __TS_ASSERT_THROWS_NOTHING( %s, %s,\n' % (suite['cfile'], suite['create']),
' %s = %s::createSuite(),\n' % (suite['object'], suite['name']),
' "%s::createSuite()" );\n' % (suite['name']),
' __TS_ASSERT( %s, %s, %s != 0,\n' % (suite['cfile'], suite['create'], suite['object']),
' "%s::createSuite() != 0" );\n' % suite['name'],
] )
def writeWorldTearDown( output ):
'''Write WorldDescription::tearDown()'''
output.write( ' void tearDown() const {\n' )
for suite in suites:
if isDynamic(suite):
writeDestroySuite(output, suite)
output.write( ' }\n' )
def writeDestroySuite( output, suite ):
'''Write line in WorldDescription::tearDown() to destroy a suite'''
output.writelines( [
' if ( ', suite['object'], ' )\n',
' __TS_ASSERT_THROWS_NOTHING( %s, %s,\n' % (suite['cfile'], suite['destroy']),
' %s::destroySuite( %s ),\n' % (suite['name'], suite['object']),
' "%s::destroySuite()" );\n' % (suite['name']),
] )
def writeClassStatics(output):
'''Write static members of CxxTest classes'''
output.writelines( [
'CxxTest::TestListener CxxTest::TestListener::_dummy;\n',
'CxxTest::TestTracker CxxTest::TestTracker::_dummy;\n',
'const CxxTest::WorldDescription CxxTest::WorldDescription::_dummy;\n',
'const CxxTest::SuiteDescription CxxTest::SuiteDescription::_dummy;\n',
'const CxxTest::TestDescription CxxTest::TestDescription::_dummy;\n',
'CxxTest::TestTracker *CxxTest::TestTracker::_tracker = &CxxTest::TestTracker::_dummy;\n',
'CxxTest::TestListener *CxxTest::TestListener::_listener = &CxxTest::TestListener::_dummy;\n',
'\n',
'CxxTest::CountingTracker CxxTest::TestRunner::_counter;\n',
'const CxxTest::WorldDescription &CxxTest::TestRunner::_world = worldDescription_theWorld;\n\n',
] )
main()
|
|
From: Yurii R. <yr...@us...> - 2003-02-02 06:59:15
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30198/libs/libsxmlstream/src
Modified Files:
Makefile.am sxml.cxx sxmlstream.cxx
Log Message:
modified build process; moving to glib-2.2.0; pkg-config;
unstable changes to `logger' component; minor changes to libsxmlstream;
binarystream test added to libsxmlstream (both text and binary streams
are broken now); per-platform INSTALL notes
Index: Makefile.am
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am 28 Jan 2003 22:39:11 -0000 1.3
+++ Makefile.am 2 Feb 2003 06:59:11 -0000 1.4
@@ -2,4 +2,4 @@
libsxmlstream_la_SOURCES = sxml.cxx sxmlstream.cxx
INCLUDES = -I../include -I$(top_srcdir)
CXXFLAGS = @GLIB_CFLAGS@
-libsxmlstream_la_LIBADD = -lglib
+libsxmlstream_la_LIBADD = @GLIB_LIBS@
Index: sxml.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxml.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sxml.cxx 28 Jan 2003 22:36:26 -0000 1.3
+++ sxml.cxx 2 Feb 2003 06:59:11 -0000 1.4
@@ -7,7 +7,7 @@
/* */
/* Author(s): */
/* Yurii A. Rashkovskii <yr...@op...> */
-/* Egor Cheshkov <eg...@ip...> */
+/* Egor Cheshkov <eg...@ip...> */
/* */
/* */
/* This program is free software; you can redistribute */
Index: sxmlstream.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxmlstream.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sxmlstream.cxx 28 Jan 2003 22:36:27 -0000 1.7
+++ sxmlstream.cxx 2 Feb 2003 06:59:11 -0000 1.8
@@ -7,6 +7,7 @@
/* */
/* Author(s): */
/* Yurii A. Rashkovskii <yr...@op...> */
+/* Egor Cheshkov <eg...@ip...> */
/* */
/* */
/* This program is free software; you can redistribute */
@@ -95,6 +96,7 @@
os << BIN_SIGN << BIN_PORTABLE_SIZE(e.data.length()) <<
e.data;
// Output attributes
+ if (!(e.descendants)->empty()) {
iter = (e.descendants)->begin();
while (iter!=(e.descendants)->end())
{
@@ -106,7 +108,9 @@
}
iter++;
}
+ }
// Output descendants
+ if (!(e.descendants)->empty()) {
iter = (e.descendants)->begin();
while (iter!=(e.descendants)->end())
{
@@ -116,6 +120,7 @@
}
iter++;
}
+ }
os << BIN_RBRACKET;
break;
@@ -192,6 +197,7 @@
case SXmlNode_Element_t:
os << "(" << e.data << " ";
// Output attributes
+ if (!(e.descendants)->empty()) {
iter = (e.descendants)->begin();
while (iter!=(e.descendants)->end())
{
@@ -203,7 +209,9 @@
}
iter++;
}
+ }
// Output descendants
+ if (!(e.descendants)->empty()) {
iter = (e.descendants)->begin();
while (iter!=(e.descendants)->end())
{
@@ -212,6 +220,7 @@
SXml_TextOutput(os,(*iter));
}
iter++;
+ }
}
os << ")";
|
|
From: Yurii R. <yr...@us...> - 2003-02-02 06:59:14
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv30198/libs/libsxmlstream/tests
Modified Files:
TextStreamTest.h
Added Files:
BinaryStreamTest.h Makefile.am
Log Message:
modified build process; moving to glib-2.2.0; pkg-config;
unstable changes to `logger' component; minor changes to libsxmlstream;
binarystream test added to libsxmlstream (both text and binary streams
are broken now); per-platform INSTALL notes
--- NEW FILE: BinaryStreamTest.h ---
/* $Id: BinaryStreamTest.h,v 1.1 2003/02/02 06:59:11 yrashk Exp $ */
#ifndef _BINARYSTREAMTEST_H_
#define _BINARYSTREAMTEST_H_
#include <iostream>
#include <sstream>
#include <string>
#include <cstring>
#include <cxxtest/TestSuite.h>
#include <sxmlstream.hxx>
using namespace std;
class BinaryStreamTest: public CxxTest::TestSuite
{
SXmlBinaryStream * _stream;
public:
void setUp()
{
_stream = new SXmlBinaryStream();
}
void tearDown()
{
}
void test_output()
{
stringstream _output("");
// Prepare structures
SXmlNode top = SXmlNode::Element("test");
SXmlNode top_attr = SXmlNode::Attribute("attr","value");
top.addChild(top_attr);
_stream->push(top);
_output << (*_stream);
TS_ASSERT_EQUALS(_output.str(), "(test (@ (attr \"value\")))");
}
};
#endif /* _BINARYSTREAMTEST_H_ */
--- NEW FILE: Makefile.am ---
bin_PROGRAMS = runTests
runTests_SOURCES = runTests.cxx
INCLUDES = -I../include
runTests_LDFLAGS = -L../src/
runTests_LDADD = @GLIB_LIBS@ -lsxmlstream
CLEANFILES = runTests.cxx
TESTS = runTests
runTests.cxx: TextStreamTest.h BinaryStreamTest.h
$(top_srcdir)/../../tools/test/cxxtestgen.py --error-printer --exit-code -o runTests.cxx \
TextStreamTest.h BinaryStreamTest.h
Index: TextStreamTest.h
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/tests/TextStreamTest.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TextStreamTest.h 28 Jan 2003 22:36:28 -0000 1.3
+++ TextStreamTest.h 2 Feb 2003 06:59:11 -0000 1.4
@@ -1,3 +1,4 @@
+/* $Id$ */
#ifndef _TEXTSTREAMTEST_H_
#define _TEXTSTREAMTEST_H_
|
|
From: Yurii R. <yr...@us...> - 2003-02-02 06:59:14
|
Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include In directory sc8-pr-cvs1:/tmp/cvs-serv30198/libs/libsxmlstream/include Modified Files: sxml.hxx Log Message: modified build process; moving to glib-2.2.0; pkg-config; unstable changes to `logger' component; minor changes to libsxmlstream; binarystream test added to libsxmlstream (both text and binary streams are broken now); per-platform INSTALL notes Index: sxml.hxx =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/include/sxml.hxx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sxml.hxx 28 Jan 2003 22:36:24 -0000 1.3 +++ sxml.hxx 2 Feb 2003 06:59:11 -0000 1.4 @@ -7,7 +7,7 @@ /* */ /* Author(s): */ /* Yurii A. Rashkovskii <yr...@op...> */ -/* Egor Cheshkov <eg...@ip...> */ +/* Egor Cheshkov <eg...@ip...> */ /* */ /* */ /* This program is free software; you can redistribute */ |
|
From: Yurii R. <yr...@us...> - 2003-02-02 06:59:14
|
Update of /cvsroot/eas-dev/eas-dev/components/gmp
In directory sc8-pr-cvs1:/tmp/cvs-serv30198/components/gmp
Modified Files:
descriptor.xml
Log Message:
modified build process; moving to glib-2.2.0; pkg-config;
unstable changes to `logger' component; minor changes to libsxmlstream;
binarystream test added to libsxmlstream (both text and binary streams
are broken now); per-platform INSTALL notes
Index: descriptor.xml
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/gmp/descriptor.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- descriptor.xml 21 Jan 2003 01:13:22 -0000 1.1
+++ descriptor.xml 2 Feb 2003 06:59:10 -0000 1.2
@@ -6,7 +6,7 @@
<author> Yurii A. Rashkovskii </author>
<name> org.openeas.grauss.MetaProtocol </name>
<description>
- Grauss Meta Protocol
+ Generic Meta Protocol
</description>
<loader-name> com.sun.star.loader.SharedLibrary </loader-name>
<language> c++ </language>
|
|
From: Yurii R. <yr...@us...> - 2003-02-02 06:59:14
|
Update of /cvsroot/eas-dev/eas-dev/components/logger/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30198/components/logger/src
Modified Files:
Makefile.am logger.cxx
Log Message:
modified build process; moving to glib-2.2.0; pkg-config;
unstable changes to `logger' component; minor changes to libsxmlstream;
binarystream test added to libsxmlstream (both text and binary streams
are broken now); per-platform INSTALL notes
Index: Makefile.am
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/src/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am 23 Jan 2003 03:42:05 -0000 1.1
+++ Makefile.am 2 Feb 2003 06:59:11 -0000 1.2
@@ -12,6 +12,6 @@
lib_LTLIBRARIES = liblogger.la
liblogger_la_SOURCES = logger.cxx consolelogger.cxx
-INCLUDES = -I../inc -I@top_include@ -I@ODK_PATH@/include
+INCLUDES = -I../../inc -I@top_include@ -I@ODK_PATH@/include
liblogger_la_LIBADD = $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STLPORTLIB) -lstdc++
liblogger_la_LDFLAGS = -L/opt/openoffice/program/ -L@ODK_PATH@/linux/lib
Index: logger.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/src/logger.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- logger.cxx 1 Feb 2003 04:10:19 -0000 1.2
+++ logger.cxx 2 Feb 2003 06:59:11 -0000 1.3
@@ -64,8 +64,9 @@
Mutex m_mutex;
sal_Int32 m_nRefCount;
-
- sal_Bool m_ignore[8];
+ sal_Bool m_ignore[8];
+
+
public:
@@ -109,9 +110,6 @@
throw (RuntimeException)
{
}
-
-#include "logger_impls.hxx"
-
};
|
|
From: Yurii R. <yr...@us...> - 2003-02-02 06:59:14
|
Update of /cvsroot/eas-dev/eas-dev/components/logger/idl/org/openeas/util
In directory sc8-pr-cvs1:/tmp/cvs-serv30198/components/logger/idl/org/openeas/util
Modified Files:
XConsoleLogger.idl XLogger.idl
Log Message:
modified build process; moving to glib-2.2.0; pkg-config;
unstable changes to `logger' component; minor changes to libsxmlstream;
binarystream test added to libsxmlstream (both text and binary streams
are broken now); per-platform INSTALL notes
Index: XConsoleLogger.idl
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/idl/org/openeas/util/XConsoleLogger.idl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- XConsoleLogger.idl 23 Jan 2003 03:43:44 -0000 1.1
+++ XConsoleLogger.idl 2 Feb 2003 06:59:11 -0000 1.2
@@ -7,9 +7,13 @@
#include <org/openeas/util/XLogger.idl>
#endif
+#ifndef _org_openeas_util_XLoggerHandler_idl_
+#include <org/openeas/util/XLoggerHandler.idl>
+#endif
+
module org { module openeas { module util {
-interface XConsoleLogger: org::openeas::util::XLogger
+interface XConsoleLogger: org::openeas::util::XLoggerHandler
{
};
Index: XLogger.idl
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/idl/org/openeas/util/XLogger.idl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- XLogger.idl 1 Feb 2003 04:10:19 -0000 1.3
+++ XLogger.idl 2 Feb 2003 06:59:11 -0000 1.4
@@ -7,19 +7,23 @@
#include <com/sun/star/uno/XInterface.idl>
#endif
+#ifndef _org_openeas_util_XLoggerHandler_idl_
+#include <org/openeas/util/XLoggerHandler.idl>
+#endif
+
module org { module openeas { module util {
// following is stolen from syslog
enum logLevel
{
- LL_EMERG = 0,
- LL_ALERT = 1,
- LL_CRIT = 2,
- LL_ERR = 3,
- LL_WARNING = 4,
- LL_NOTICE = 5,
- LL_INFO = 6,
- LL_DEBUG = 7
+ EMERG = 0,
+ ALERT = 1,
+ CRIT = 2,
+ ERR = 3,
+ WARNING = 4,
+ NOTICE = 5,
+ INFO = 6,
+ DEBUG = 7
};
interface XLogger: com::sun::star::uno::XInterface
@@ -27,7 +31,8 @@
void ignoreLogLevel([in] logLevel aLL, [in] boolean bOnOff);
void log([in] logLevel aLL, [in] string message);
- sequence<string> getImplementations();
+ void addHandler([in] XLoggerHandler xHandler);
+ void removeHandler([in] XLoggerHandler xHandler);
};
|
|
From: Yurii R. <yr...@us...> - 2003-02-02 06:59:14
|
Update of /cvsroot/eas-dev/eas-dev/components/logger
In directory sc8-pr-cvs1:/tmp/cvs-serv30198/components/logger
Modified Files:
Makefile.am descriptor.xml
Log Message:
modified build process; moving to glib-2.2.0; pkg-config;
unstable changes to `logger' component; minor changes to libsxmlstream;
binarystream test added to libsxmlstream (both text and binary streams
are broken now); per-platform INSTALL notes
Index: Makefile.am
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am 25 Jan 2003 21:51:27 -0000 1.4
+++ Makefile.am 2 Feb 2003 06:59:10 -0000 1.5
@@ -1,4 +1,5 @@
-IDL_FILES = org/openeas/util/XLogger.idl org/openeas/util/XConsoleLogger.idl \
+IDL_FILES = org/openeas/util/XLogger.idl org/openeas/util/XLoggerHandler.idl \
+ org/openeas/util/XConsoleLogger.idl \
org/openeas/util/Logger.idl
SRC_FILES = logger.cxx consolelogger.cxx
Index: descriptor.xml
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/descriptor.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- descriptor.xml 23 Jan 2003 03:42:05 -0000 1.2
+++ descriptor.xml 2 Feb 2003 06:59:10 -0000 1.3
@@ -27,6 +27,7 @@
<type> com.sun.star.lang.XComponent </type>
<type> com.sun.star.lang.XServiceInfo </type>
<type> org.openeas.util.XLogger </type>
+ <type> org.openeas.util.XLoggerHandler </type>
<type> org.openeas.util.XConsoleLogger </type>
</component-description>
<project-build-dependency> cppuhelper </project-build-dependency>
|
|
From: Yurii R. <yr...@us...> - 2003-02-02 06:59:14
|
Update of /cvsroot/eas-dev/eas-dev/components In directory sc8-pr-cvs1:/tmp/cvs-serv30198/components Modified Files: .cvsignore Log Message: modified build process; moving to glib-2.2.0; pkg-config; unstable changes to `logger' component; minor changes to libsxmlstream; binarystream test added to libsxmlstream (both text and binary streams are broken now); per-platform INSTALL notes Index: .cvsignore =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .cvsignore 23 Jan 2003 00:50:27 -0000 1.3 +++ .cvsignore 2 Feb 2003 06:59:10 -0000 1.4 @@ -2,4 +2,5 @@ Makefile.in openeas-basic.bin openeas-basic.rdb -openeas.rdb \ No newline at end of file +openeas.rdb +inc \ No newline at end of file |
|
From: Yurii R. <yr...@us...> - 2003-02-02 06:59:13
|
Update of /cvsroot/eas-dev/eas-dev/build/unix/mk In directory sc8-pr-cvs1:/tmp/cvs-serv30198/build/unix/mk Modified Files: component.mk.in Log Message: modified build process; moving to glib-2.2.0; pkg-config; unstable changes to `logger' component; minor changes to libsxmlstream; binarystream test added to libsxmlstream (both text and binary streams are broken now); per-platform INSTALL notes Index: component.mk.in =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/build/unix/mk/component.mk.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- component.mk.in 25 Jan 2003 21:51:27 -0000 1.5 +++ component.mk.in 2 Feb 2003 06:59:10 -0000 1.6 @@ -36,7 +36,7 @@ endif ifndef INC_PATH - INC_PATH = inc + INC_PATH = ../inc endif ifndef SRC_PATH |
|
From: Yurii R. <yr...@us...> - 2003-02-02 06:59:13
|
Update of /cvsroot/eas-dev/eas-dev In directory sc8-pr-cvs1:/tmp/cvs-serv30198 Added Files: INSTALL Log Message: modified build process; moving to glib-2.2.0; pkg-config; unstable changes to `logger' component; minor changes to libsxmlstream; binarystream test added to libsxmlstream (both text and binary streams are broken now); per-platform INSTALL notes --- NEW FILE: INSTALL --- To learn about how to compile and install E/AS, please read platform-specific `INSTALL' file. UN*X-like systems (like Linux, FreeBSD and so on) - build/unix/INSTALL |
|
From: Yurii R. <yr...@us...> - 2003-02-02 06:59:13
|
Update of /cvsroot/eas-dev/eas-dev/build/unix In directory sc8-pr-cvs1:/tmp/cvs-serv30198/build/unix Modified Files: configure.in local.m4 Added Files: INSTALL Log Message: modified build process; moving to glib-2.2.0; pkg-config; unstable changes to `logger' component; minor changes to libsxmlstream; binarystream test added to libsxmlstream (both text and binary streams are broken now); per-platform INSTALL notes --- NEW FILE: INSTALL --- E/AS Compilation and Installation for UN*X-like Systems ======================================================= PREREQUISITES ============= Following software is needed to build E/AS. automake 1.4-p5 autoconf 2.13 gcc 3.0.4 or higher make 3.79.1 or higher glib 2.2.0 (http://www.gtk.org/) CxxTest 2.8.0 (http://cxxtest.sourceforge.net/) pkg-config 0.15.0 (http://www.freedesktop.org/software/pkgconfig) OpenOffice.Org SDK 1.0.1_alpha (http://udk.openoffice.org/) Python 2.0 or higher (http://www.python.org/) NOTES ON OPENOFFICE.ORG SDK =========================== Install OpenOffice.Org SDK to somewhat directory (for example, /usr/local/odk), run `configure' script for it. Then move variables initialization from `setsdkenv_unix' script to your shell rc (.bashrc, .profile, etc.). Then add /usr/local/odk/[OS]/bin/ to PATH. ([OS] is a name of an operating system, for example, `linux'). Currently it seems that OpenOffice.Org SDK needs OpenOffice installed. Please install corresponding OpenOffice version (for example, to /opt/openoffice) and if it will be needed, repair broken links from /usr/local/odk/[OS]/lib/ to let them point to corresponding libraries at /opt/openoffice/program. COMPILATION =========== In build/unix directory type $ ./configure then move to the top level of the E/AS source tree: $ cd ../.. and start compiling: $ make -- Good Luck! Index: configure.in =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/build/unix/configure.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- configure.in 28 Jan 2003 06:44:32 -0000 1.10 +++ configure.in 2 Feb 2003 06:59:10 -0000 1.11 @@ -11,8 +11,6 @@ dnl AC_PREFIX_DEFAULT(/opt/eas) -GLIB_VERSION_REQUIRED=1.2.0 - AC_ISC_POSIX dnl dnl Check host, target, build @@ -87,11 +85,7 @@ dnl dnl Checks for libraries. -AC_CHECK_PROG(HAVE_GLIB_CONFIG, glib-config, yes, no) - -AC_SUBST(GLIB_VERSION_REQUIRED) -AM_PATH_GLIB($GLIB_VERSION_REQUIRED) - +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.2.0) dnl dnl Tools @@ -129,6 +123,7 @@ ../../libs/Makefile ../../libs/libsxmlstream/Makefile ../../libs/libsxmlstream/src/Makefile + ../../libs/libsxmlstream/tests/Makefile ../../libs/libsmstorage/Makefile ../../libs/libsmstorage/src/Makefile ]) Index: local.m4 =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/build/unix/local.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- local.m4 28 Jan 2003 03:18:22 -0000 1.1 +++ local.m4 2 Feb 2003 06:59:10 -0000 1.2 @@ -1,189 +0,0 @@ -# Configure paths for GLIB -# Owen Taylor 97-11-3 - -dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" is specified -dnl in MODULES, feature the glib-config gmodule option. -dnl -AC_DEFUN(AM_PATH_GLIB, -[dnl -dnl Get the cflags and libraries from the glib-config script -dnl -AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], - glib_config_prefix="$withval", glib_config_prefix="") -AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], - glib_config_exec_prefix="$withval", glib_config_exec_prefix="") -AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - if test x$glib_config_exec_prefix != x ; then - glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config - fi - fi - if test x$glib_config_prefix != x ; then - glib_config_args="$glib_config_args --prefix=$glib_config_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_prefix/bin/glib-config - fi - fi - - case "$4" in - *gmodule*) glib_config_args="$glib_config_args gmodule";; - esac - - AC_PATH_PROG(GLIB_CONFIG, glib-config, no) - min_glib_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes - else - GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` - GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` - glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of glib-config to some extent -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include <glib.h> -#include <stdio.h> -#include <stdlib.h> - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.glibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If glib-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); - printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the glib-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); - printf("*** correct copy of glib-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GLIB_CONFIG" = "no" ; then - echo "*** The glib-config script installed by GLIB could not be found" - echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GLIB_CONFIG environment variable to the" - echo "*** full path to glib-config." - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include <glib.h> -#include <stdio.h> -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB was incorrectly installed" - echo "*** or that you have moved GLIB since it was installed. In the latter case, you" - echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - rm -f conf.glibtest -]) - |
|
From: Yurii R. <yr...@us...> - 2003-02-02 06:51:35
|
Update of /cvsroot/eas-dev/eas-dev/tools/test In directory sc8-pr-cvs1:/tmp/cvs-serv28761/test Log Message: Directory /cvsroot/eas-dev/eas-dev/tools/test added to the repository |
|
From: Yurii R. <yr...@us...> - 2003-02-01 04:10:22
|
Update of /cvsroot/eas-dev/eas-dev/components/logger/src
In directory sc8-pr-cvs1:/tmp/cvs-serv10261/components/logger/src
Modified Files:
consolelogger.cxx consolelogger.hxx logger.cxx
Added Files:
logger_impls.hxx
Log Message:
minor modifications to `logger' component (not finished yet)
--- NEW FILE: logger_impls.hxx ---
/* $Id: logger_impls.hxx,v 1.1 2003/02/01 04:10:19 yrashk Exp $ */
Sequence<OU_String> SAL_CALL getImplementations()
throw (RuntimeException)
{
// TODO
}
Index: consolelogger.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/src/consolelogger.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- consolelogger.cxx 23 Jan 2003 03:42:05 -0000 1.1
+++ consolelogger.cxx 1 Feb 2003 04:10:19 -0000 1.2
@@ -96,7 +96,7 @@
throw(RuntimeException);
static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static();
- // XXConsoleLogger
+ // XConsoleLogger
virtual void SAL_CALL ignoreLogLevel (logLevel aLL, sal_Bool bOnOff)
throw (RuntimeException)
{
@@ -110,6 +110,7 @@
cout << message;
}
+#include "logger_impls.hxx"
};
Index: consolelogger.hxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/src/consolelogger.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- consolelogger.hxx 23 Jan 2003 03:42:05 -0000 1.1
+++ consolelogger.hxx 1 Feb 2003 04:10:19 -0000 1.2
@@ -55,6 +55,7 @@
throw (RuntimeException);
virtual void SAL_CALL log(logLevel aLL, const OUString& message)
throw (RuntimeException);
+ Sequence<OU_String> SAL_CALL getImplementations() throw (RuntimeException);
};
Reference<XInterface> SAL_CALL XConsoleLoggerImpl_create(
Index: logger.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/src/logger.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- logger.cxx 23 Jan 2003 03:42:05 -0000 1.1
+++ logger.cxx 1 Feb 2003 04:10:19 -0000 1.2
@@ -110,6 +110,8 @@
{
}
+#include "logger_impls.hxx"
+
};
|
|
From: Yurii R. <yr...@us...> - 2003-02-01 04:10:22
|
Update of /cvsroot/eas-dev/eas-dev/components/logger/idl/org/openeas/util
In directory sc8-pr-cvs1:/tmp/cvs-serv10261/components/logger/idl/org/openeas/util
Modified Files:
Logger.idl XLogger.idl
Log Message:
minor modifications to `logger' component (not finished yet)
Index: Logger.idl
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/idl/org/openeas/util/Logger.idl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Logger.idl 23 Jan 2003 03:42:05 -0000 1.2
+++ Logger.idl 1 Feb 2003 04:10:19 -0000 1.3
@@ -15,6 +15,7 @@
service Logger
{
+ interface XLogger;
interface XConsoleLogger;
};
Index: XLogger.idl
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/components/logger/idl/org/openeas/util/XLogger.idl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- XLogger.idl 23 Jan 2003 03:42:05 -0000 1.2
+++ XLogger.idl 1 Feb 2003 04:10:19 -0000 1.3
@@ -26,6 +26,8 @@
{
void ignoreLogLevel([in] logLevel aLL, [in] boolean bOnOff);
void log([in] logLevel aLL, [in] string message);
+
+ sequence<string> getImplementations();
};
|
