[liblouis-liblouisxml] [liblouisutdml] 15 new revisions pushed by mwhapples on 2014-06-26 10:56 GMT
- From: liblouisutdml@xxxxxxxxxxxxxx
- To: liblouis-liblouisxml@xxxxxxxxxxxxx
- Date: Thu, 26 Jun 2014 10:56:38 +0000
15 new revisions:
Revision: e10f826e9d62
Branch: scons-build
Author: Michael Whapples
Date: Tue Jun 24 15:38:21 2014 UTC
Log: SConstruct file, only initial much improvement expected to come.
http://code.google.com/p/liblouisutdml/source/detail?r=e10f826e9d62
Revision: 6a48d85e25bc
Branch: scons-build
Author: Michael Whapples
Date: Wed Jun 25 13:59:16 2014 UTC
Log: Improvements to SConstruct
http://code.google.com/p/liblouisutdml/source/detail?r=6a48d85e25bc
Revision: ac5ff725d87d
Branch: scons-build
Author: Michael Whapples
Date: Wed Jun 25 14:53:42 2014 UTC
Log: Fix where libxml2 include and libs will be found.
http://code.google.com/p/liblouisutdml/source/detail?r=ac5ff725d87d
Revision: d7609155f4f0
Branch: scons-build
Author: Michael Whapples
Date: Wed Jun 25 15:21:32 2014 UTC
Log: Fixes and improvements to SConstruct
http://code.google.com/p/liblouisutdml/source/detail?r=d7609155f4f0
Revision: 243d2716a793
Branch: scons-build
Author: Michael Whapples
Date: Wed Jun 25 15:25:57 2014 UTC
Log: Fix making java bindings optional depednent on finding jni.h
http://code.google.com/p/liblouisutdml/source/detail?r=243d2716a793
Revision: d52cf41e0dcd
Branch: scons-build
Author: Michael Whapples
Date: Wed Jun 25 15:32:17 2014 UTC
Log: Fix directory for liblouis includes
http://code.google.com/p/liblouisutdml/source/detail?r=d52cf41e0dcd
Revision: e98fdf8d7172
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:29:29 2014 UTC
Log: Fix some windows issues
http://code.google.com/p/liblouisutdml/source/detail?r=e98fdf8d7172
Revision: 1ce443e6e24d
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:35:11 2014 UTC
Log: Fix typo
http://code.google.com/p/liblouisutdml/source/detail?r=1ce443e6e24d
Revision: e722a02a123a
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:37:38 2014 UTC
Log: Fix another typo
http://code.google.com/p/liblouisutdml/source/detail?r=e722a02a123a
Revision: 063ea5bad882
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:43:28 2014 UTC
Log: Include platform specific subdirectory for java includes
http://code.google.com/p/liblouisutdml/source/detail?r=063ea5bad882
Revision: f1ddf962c59f
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:47:12 2014 UTC
Log: Add liblouisutdml.def to scons build
http://code.google.com/p/liblouisutdml/source/detail?r=f1ddf962c59f
Revision: c9b145971012
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:49:10 2014 UTC
Log: Remember liblouisutdml.def is in windows directory
http://code.google.com/p/liblouisutdml/source/detail?r=c9b145971012
Revision: b63d47f1acb3
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:52:54 2014 UTC
Log: Fix another name issue
http://code.google.com/p/liblouisutdml/source/detail?r=b63d47f1acb3
Revision: 3acf3ce7b0ae
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 10:19:40 2014 UTC
Log: Fix typo in JAVA_HOME environment variable name
http://code.google.com/p/liblouisutdml/source/detail?r=3acf3ce7b0ae
Revision: 4f0e12022362
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 11:06:26 2014 UTC
Log: Added linux subdirectory of JDK include directory to includes
http://code.google.com/p/liblouisutdml/source/detail?r=4f0e12022362
==============================================================================
Revision: e10f826e9d62
Branch: scons-build
Author: Michael Whapples
Date: Tue Jun 24 15:38:21 2014 UTC
Log: SConstruct file, only initial much improvement expected to come.
http://code.google.com/p/liblouisutdml/source/detail?r=e10f826e9d62
Added:
/SConstruct
=======================================
--- /dev/null
+++ /SConstruct Tue Jun 24 15:38:21 2014 UTC
@@ -0,0 +1,66 @@
+import os
+
+configEnvDefines = {'PACKAGE': 'liblouisutdml',
+ 'PACKAGE_NAME': 'liblouisutdml',
+ 'PACKAGE_STRING': 'liblouisutdml 2.5.0',
+ 'PACKAGE_VERSION': '2.5.0',
+ 'PACKAGE_BUGREPORT': 'john.boyer@xxxxxxxxxxxxxxxxx',
+ 'PACKAGE_URL': '',
+ 'VERSION': '2.5.0'
+ }
+cSRCFiles = ['liblouisutdml/change_table.c',
+ 'liblouisutdml/makeContents.c',
+ 'liblouisutdml/examine_document.c',
+ 'liblouisutdml/liblouisutdml.c',
+ 'liblouisutdml/logging.c',
+ 'liblouisutdml/paths.c',
+ 'liblouisutdml/readconfig.c',
+ 'liblouisutdml/semantics.c',
+ 'liblouisutdml/transcribe_cdataSection.c',
+ 'liblouisutdml/transcribe_chemistry.c',
+ 'liblouisutdml/transcribe_computerCode.c',
+ 'liblouisutdml/transcribe_document.c',
+ 'liblouisutdml/transcribe_graphic.c',
+ 'liblouisutdml/transcribe_math.c',
+ 'liblouisutdml/transcribe_music.c',
+ 'liblouisutdml/transcribe_paragraph.c',
+ 'liblouisutdml/convert_utd.c',
+ 'liblouisutdml/utd2transinxml.c',
+ 'liblouisutdml/utd2dsbible.c',
+ 'liblouisutdml/utd2brf.c',
+ 'liblouisutdml/utd2pef.c',
+ 'liblouisutdml/utd2volumes.c',
+ 'liblouisutdml/transcriber.c',
+ ]
+jniSRCFiles = ['java/Jliblouisutdml.c']
+toolsSRCFiles = ['tools/file2brl.c']
+louisutdmlDepLibs = ['louis', 'xml2']
+
+env = Environment()
+env.ParseConfig('pkg-config liblouis --cflags --libs')
+env.ParseConfig('pkg-config libxml-2.0 --cflags --libs')
+env.Append(CPPDEFINES={'LIBLOUIS_TABLES_PATH':
'\\"/usr/local/share/liblouis/tables/\\"',
+ 'LBU_PATH':
'\\"/usr/local/share/liblouisutdml/lbu_files/\\"'
+ },
+ CPPPATH=['liblouisutdml', 'java', 'gnulib'])
+env.Append(**configEnvDefines)
+javacDir = os.path.dirname(env.WhereIs('javac'))
+if not javacDir:
+ print("javac not found.")
+ Exit(1)
+javaBaseDir = os.path.join(javacDir, '..')
+print("Java in:%s" % javaBaseDir)
+conf = Configure(env, config_h='liblouisutdml/config.h')
+if not conf.CheckCC():
+ print("C compiler not found.")
+ Exit(1)
+if not conf.CheckCHeader('liblouis.h'):
+ print("liblouis.h not found.")
+ Exit(1)
+for defName, defVal in configEnvDefines.items():
+ conf.Define(defName, '"%s"' % defVal)
+env = conf.Finish()
+
+utdmlSharedLibs = env.SharedLibrary('louisutdml', cSRCFiles + jniSRCFiles,
LIBS=louisutdmlDepLibs)
+env.Program('file2brl', toolsSRCFiles +
['gnulib/progname.c', 'gnulib/version-etc.c'], LIBS=utdmlSharedLibs)
+
==============================================================================
Revision: 6a48d85e25bc
Branch: scons-build
Author: Michael Whapples
Date: Wed Jun 25 13:59:16 2014 UTC
Log: Improvements to SConstruct
http://code.google.com/p/liblouisutdml/source/detail?r=6a48d85e25bc
Modified:
/SConstruct
=======================================
--- /SConstruct Tue Jun 24 15:38:21 2014 UTC
+++ /SConstruct Wed Jun 25 13:59:16 2014 UTC
@@ -1,6 +1,23 @@
import os
-configEnvDefines = {'PACKAGE': 'liblouisutdml',
+# Some helper function definitions
+
+def CheckPKGConfig(context, version):
+ """Checks whether pkg-config of a given version can be found."""
+ context.Message("Checking for pkg-config %s..." % version)
+ ret = context.TryAction('pkg-config --atleast-pkgconfig-version=%s' %
version)[0]
+ context.Result(ret)
+ return ret
+
+def CheckPKG(context, name):
+ """Checks for package using pkg-config"""
+ context.Message("Checking for %s..." % name)
+ ret = context.TryAction('pkg-config --exists \'%s\'' % name)[0]
+ context.Result(ret)
+ return ret
+
+
+packageConfigDefines = {'PACKAGE': 'liblouisutdml',
'PACKAGE_NAME': 'liblouisutdml',
'PACKAGE_STRING': 'liblouisutdml 2.5.0',
'PACKAGE_VERSION': '2.5.0',
@@ -37,30 +54,60 @@
louisutdmlDepLibs = ['louis', 'xml2']
env = Environment()
-env.ParseConfig('pkg-config liblouis --cflags --libs')
-env.ParseConfig('pkg-config libxml-2.0 --cflags --libs')
-env.Append(CPPDEFINES={'LIBLOUIS_TABLES_PATH':
'\\"/usr/local/share/liblouis/tables/\\"',
- 'LBU_PATH':
'\\"/usr/local/share/liblouisutdml/lbu_files/\\"'
- },
- CPPPATH=['liblouisutdml', 'java', 'gnulib'])
-env.Append(**configEnvDefines)
-javacDir = os.path.dirname(env.WhereIs('javac'))
-if not javacDir:
- print("javac not found.")
- Exit(1)
-javaBaseDir = os.path.join(javacDir, '..')
-print("Java in:%s" % javaBaseDir)
-conf = Configure(env, config_h='liblouisutdml/config.h')
+conf = Configure(env,
+ custom_tests={'CheckPKGConfig': CheckPKGConfig,
+ 'CheckPKG': CheckPKG},
+ config_h='liblouisutdml/config.h'
+ )
if not conf.CheckCC():
- print("C compiler not found.")
+ print('C compiler not found.')
Exit(1)
-if not conf.CheckCHeader('liblouis.h'):
- print("liblouis.h not found.")
+if not conf.CheckPKGConfig('0.15.0'):
+ if sys.platform == 'win32':
+ liblouisIncDir = [os.path.join('..', 'liblouis', 'include')]
+ libxml2IncDir = [os.path.join('..', 'libxml2', 'include', 'libxml')]
+ liblouisLibDir = [os.path.join('..', 'liblouis')]
+ libxml2LibDir = [os.path.join('..', 'libxml2')]
+ else:
+ print('pkg-config >= 0.15.0 not found.')
+ Exit(1)
+else:
+ if not conf.CheckPKG('liblouis >= 2.5.4'):
+ print('liblouis not found.')
+ Exit(1)
+ else:
+ conf.env.ParseConfig('pkg-config --cflags --libs liblouis')
+ if not conf.CheckPKG('libxml-2.0'):
+ print('libxml2 not found.')
+ Exit(1)
+ else:
+ conf.env.ParseConfig('pkg-config --cflags --libs libxml-2.0')
+if not conf.CheckCHeader('stdlib.h'):
+ print('stdlib.h not found.')
Exit(1)
-for defName, defVal in configEnvDefines.items():
+if not conf.CheckCHeader('string.h'):
+ print('string.h not found.')
+ Exit(1)
+if not conf.CheckFunc('memset'):
+ print('memset function not found.')
+ Exit(1)
+javaHome = os.environ.get('JAVA_HOME')
+if javaHome:
+ conf.env.Append(CPPFLAGS=[os.path.join(javaHome, 'include')])
+if not conf.CheckCHeader('jni.h'):
+ print('jni.h not found.')
+ Exit(1)
+for defName, defVal in packageConfigDefines.items():
conf.Define(defName, '"%s"' % defVal)
env = conf.Finish()
+# env.ParseConfig('pkg-config liblouis --cflags --libs')
+# env.ParseConfig('pkg-config libxml-2.0 --cflags --libs')
+env.Append(CPPDEFINES={'LIBLOUIS_TABLES_PATH':
'\\"/usr/local/share/liblouis/tables/\\"',
+ 'LBU_PATH':
'\\"/usr/local/share/liblouisutdml/lbu_files/\\"'
+ },
+ CPPPATH=['liblouisutdml', 'java', 'gnulib'])
+
utdmlSharedLibs = env.SharedLibrary('louisutdml', cSRCFiles + jniSRCFiles,
LIBS=louisutdmlDepLibs)
env.Program('file2brl', toolsSRCFiles +
['gnulib/progname.c', 'gnulib/version-etc.c'], LIBS=utdmlSharedLibs)
==============================================================================
Revision: ac5ff725d87d
Branch: scons-build
Author: Michael Whapples
Date: Wed Jun 25 14:53:42 2014 UTC
Log: Fix where libxml2 include and libs will be found.
http://code.google.com/p/liblouisutdml/source/detail?r=ac5ff725d87d
Modified:
/SConstruct
=======================================
--- /SConstruct Wed Jun 25 13:59:16 2014 UTC
+++ /SConstruct Wed Jun 25 14:53:42 2014 UTC
@@ -65,9 +65,9 @@
if not conf.CheckPKGConfig('0.15.0'):
if sys.platform == 'win32':
liblouisIncDir = [os.path.join('..', 'liblouis', 'include')]
- libxml2IncDir = [os.path.join('..', 'libxml2', 'include', 'libxml')]
+ libxml2IncDir = [os.path.join('..', 'libxml2', 'include', 'libxml2')]
liblouisLibDir = [os.path.join('..', 'liblouis')]
- libxml2LibDir = [os.path.join('..', 'libxml2')]
+ libxml2LibDir = [os.path.join('..', 'libxml2', 'lib')]
else:
print('pkg-config >= 0.15.0 not found.')
Exit(1)
==============================================================================
Revision: d7609155f4f0
Branch: scons-build
Author: Michael Whapples
Date: Wed Jun 25 15:21:32 2014 UTC
Log: Fixes and improvements to SConstruct
http://code.google.com/p/liblouisutdml/source/detail?r=d7609155f4f0
Modified:
/SConstruct
=======================================
--- /SConstruct Wed Jun 25 14:53:42 2014 UTC
+++ /SConstruct Wed Jun 25 15:21:32 2014 UTC
@@ -1,4 +1,5 @@
import os
+import sys
# Some helper function definitions
@@ -52,6 +53,8 @@
jniSRCFiles = ['java/Jliblouisutdml.c']
toolsSRCFiles = ['tools/file2brl.c']
louisutdmlDepLibs = ['louis', 'xml2']
+incDirs = ['liblouisutdml', 'gnulib']
+libDirs = []
env = Environment()
conf = Configure(env,
@@ -66,8 +69,10 @@
if sys.platform == 'win32':
liblouisIncDir = [os.path.join('..', 'liblouis', 'include')]
libxml2IncDir = [os.path.join('..', 'libxml2', 'include', 'libxml2')]
+ incDirs += libxml2IncDir + liblouisIncDir
liblouisLibDir = [os.path.join('..', 'liblouis')]
libxml2LibDir = [os.path.join('..', 'libxml2', 'lib')]
+ libDirs += libxml2LibDir + liblouisLibDir
else:
print('pkg-config >= 0.15.0 not found.')
Exit(1)
@@ -93,10 +98,13 @@
Exit(1)
javaHome = os.environ.get('JAVA_HOME')
if javaHome:
- conf.env.Append(CPPFLAGS=[os.path.join(javaHome, 'include')])
+ conf.env.Append(CPPPATH=[os.path.join(javaHome, 'include')])
if not conf.CheckCHeader('jni.h'):
print('jni.h not found.')
Exit(1)
+else:
+ incDirs += ['java']
+ cSRCFiles += jniSRCFiles
for defName, defVal in packageConfigDefines.items():
conf.Define(defName, '"%s"' % defVal)
env = conf.Finish()
@@ -106,8 +114,9 @@
env.Append(CPPDEFINES={'LIBLOUIS_TABLES_PATH': '\\"/usr/local/share/liblouis/tables/\\"',
'LBU_PATH':
'\\"/usr/local/share/liblouisutdml/lbu_files/\\"'
},
- CPPPATH=['liblouisutdml', 'java', 'gnulib'])
+ CPPPATH=incDirs,
+ LIBPATH=libDirs)
-utdmlSharedLibs = env.SharedLibrary('louisutdml', cSRCFiles + jniSRCFiles,
LIBS=louisutdmlDepLibs)
+utdmlSharedLibs = env.SharedLibrary('louisutdml', cSRCFiles,
LIBS=louisutdmlDepLibs)
env.Program('file2brl', toolsSRCFiles +
['gnulib/progname.c', 'gnulib/version-etc.c'], LIBS=utdmlSharedLibs)
==============================================================================
Revision: 243d2716a793
Branch: scons-build
Author: Michael Whapples
Date: Wed Jun 25 15:25:57 2014 UTC
Log: Fix making java bindings optional depednent on finding jni.h
http://code.google.com/p/liblouisutdml/source/detail?r=243d2716a793
Modified:
/SConstruct
=======================================
--- /SConstruct Wed Jun 25 15:21:32 2014 UTC
+++ /SConstruct Wed Jun 25 15:25:57 2014 UTC
@@ -99,10 +99,7 @@
javaHome = os.environ.get('JAVA_HOME')
if javaHome:
conf.env.Append(CPPPATH=[os.path.join(javaHome, 'include')])
-if not conf.CheckCHeader('jni.h'):
- print('jni.h not found.')
- Exit(1)
-else:
+if conf.CheckCHeader('jni.h'):
incDirs += ['java']
cSRCFiles += jniSRCFiles
for defName, defVal in packageConfigDefines.items():
==============================================================================
Revision: d52cf41e0dcd
Branch: scons-build
Author: Michael Whapples
Date: Wed Jun 25 15:32:17 2014 UTC
Log: Fix directory for liblouis includes
http://code.google.com/p/liblouisutdml/source/detail?r=d52cf41e0dcd
Modified:
/SConstruct
=======================================
--- /SConstruct Wed Jun 25 15:25:57 2014 UTC
+++ /SConstruct Wed Jun 25 15:32:17 2014 UTC
@@ -67,7 +67,7 @@
Exit(1)
if not conf.CheckPKGConfig('0.15.0'):
if sys.platform == 'win32':
- liblouisIncDir = [os.path.join('..', 'liblouis', 'include')]
+ liblouisIncDir = [os.path.join('..', 'liblouis', 'liblouis')]
libxml2IncDir = [os.path.join('..', 'libxml2', 'include', 'libxml2')]
incDirs += libxml2IncDir + liblouisIncDir
liblouisLibDir = [os.path.join('..', 'liblouis')]
==============================================================================
Revision: e98fdf8d7172
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:29:29 2014 UTC
Log: Fix some windows issues
http://code.google.com/p/liblouisutdml/source/detail?r=e98fdf8d7172
Modified:
/SConstruct
=======================================
--- /SConstruct Wed Jun 25 15:32:17 2014 UTC
+++ /SConstruct Thu Jun 26 08:29:29 2014 UTC
@@ -53,10 +53,16 @@
jniSRCFiles = ['java/Jliblouisutdml.c']
toolsSRCFiles = ['tools/file2brl.c']
louisutdmlDepLibs = ['louis', 'xml2']
-incDirs = ['liblouisutdml', 'gnulib']
+incDirs = ['liblouisutdml']
libDirs = []
env = Environment()
+# Add JAVA_HOME paths if defined in environment variables
+javaHome = os.environ.get('HAVA_HOME')
+if javaHome:
+ env.Append(CPPPATH=[os.path.join(javaHome, 'include')
+
+# Now configure for the system
conf = Configure(env,
custom_tests={'CheckPKGConfig': CheckPKGConfig,
'CheckPKG': CheckPKG},
@@ -73,6 +79,8 @@
liblouisLibDir = [os.path.join('..', 'liblouis')]
libxml2LibDir = [os.path.join('..', 'libxml2', 'lib')]
libDirs += libxml2LibDir + liblouisLibDir
+ # Due to Windows linking and names, we need to redefine the libs
+ liblouisutdmlDepLibs = ['liblouis', 'libxml2']
else:
print('pkg-config >= 0.15.0 not found.')
Exit(1)
@@ -96,9 +104,6 @@
if not conf.CheckFunc('memset'):
print('memset function not found.')
Exit(1)
-javaHome = os.environ.get('JAVA_HOME')
-if javaHome:
- conf.env.Append(CPPPATH=[os.path.join(javaHome, 'include')])
if conf.CheckCHeader('jni.h'):
incDirs += ['java']
cSRCFiles += jniSRCFiles
@@ -115,5 +120,5 @@
LIBPATH=libDirs)
utdmlSharedLibs = env.SharedLibrary('louisutdml', cSRCFiles,
LIBS=louisutdmlDepLibs)
-env.Program('file2brl', toolsSRCFiles +
['gnulib/progname.c', 'gnulib/version-etc.c'], LIBS=utdmlSharedLibs)
+# env.Program('file2brl', toolsSRCFiles +
['gnulib/progname.c', 'gnulib/version-etc.c'], LIBS=utdmlSharedLibs)
==============================================================================
Revision: 1ce443e6e24d
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:35:11 2014 UTC
Log: Fix typo
http://code.google.com/p/liblouisutdml/source/detail?r=1ce443e6e24d
Modified:
/SConstruct
=======================================
--- /SConstruct Thu Jun 26 08:29:29 2014 UTC
+++ /SConstruct Thu Jun 26 08:35:11 2014 UTC
@@ -60,7 +60,7 @@
# Add JAVA_HOME paths if defined in environment variables
javaHome = os.environ.get('HAVA_HOME')
if javaHome:
- env.Append(CPPPATH=[os.path.join(javaHome, 'include')
+ env.Append(CPPPATH=[os.path.join(javaHome, 'include'))
# Now configure for the system
conf = Configure(env,
==============================================================================
Revision: e722a02a123a
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:37:38 2014 UTC
Log: Fix another typo
http://code.google.com/p/liblouisutdml/source/detail?r=e722a02a123a
Modified:
/SConstruct
=======================================
--- /SConstruct Thu Jun 26 08:35:11 2014 UTC
+++ /SConstruct Thu Jun 26 08:37:38 2014 UTC
@@ -60,7 +60,7 @@
# Add JAVA_HOME paths if defined in environment variables
javaHome = os.environ.get('HAVA_HOME')
if javaHome:
- env.Append(CPPPATH=[os.path.join(javaHome, 'include'))
+ env.Append(CPPPATH=[os.path.join(javaHome, 'include')])
# Now configure for the system
conf = Configure(env,
==============================================================================
Revision: 063ea5bad882
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:43:28 2014 UTC
Log: Include platform specific subdirectory for java includes
http://code.google.com/p/liblouisutdml/source/detail?r=063ea5bad882
Modified:
/SConstruct
=======================================
--- /SConstruct Thu Jun 26 08:37:38 2014 UTC
+++ /SConstruct Thu Jun 26 08:43:28 2014 UTC
@@ -60,7 +60,8 @@
# Add JAVA_HOME paths if defined in environment variables
javaHome = os.environ.get('HAVA_HOME')
if javaHome:
- env.Append(CPPPATH=[os.path.join(javaHome, 'include')])
+ env.Append(CPPPATH=[os.path.join(javaHome, 'include'),
+ os.path.join(javaHome, 'include', 'win32')])
# Now configure for the system
conf = Configure(env,
@@ -119,6 +120,6 @@
CPPPATH=incDirs,
LIBPATH=libDirs)
-utdmlSharedLibs = env.SharedLibrary('louisutdml', cSRCFiles,
LIBS=louisutdmlDepLibs)
+utdmlSharedLibs = env.SharedLibrary('liblouisutdml', cSRCFiles,
LIBS=louisutdmlDepLibs)
# env.Program('file2brl', toolsSRCFiles +
['gnulib/progname.c', 'gnulib/version-etc.c'], LIBS=utdmlSharedLibs)
==============================================================================
Revision: f1ddf962c59f
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:47:12 2014 UTC
Log: Add liblouisutdml.def to scons build
http://code.google.com/p/liblouisutdml/source/detail?r=f1ddf962c59f
Modified:
/SConstruct
=======================================
--- /SConstruct Thu Jun 26 08:43:28 2014 UTC
+++ /SConstruct Thu Jun 26 08:47:12 2014 UTC
@@ -80,6 +80,7 @@
liblouisLibDir = [os.path.join('..', 'liblouis')]
libxml2LibDir = [os.path.join('..', 'libxml2', 'lib')]
libDirs += libxml2LibDir + liblouisLibDir
+ cSRCFiles += ['liblouisutdml.def']
# Due to Windows linking and names, we need to redefine the libs
liblouisutdmlDepLibs = ['liblouis', 'libxml2']
else:
==============================================================================
Revision: c9b145971012
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:49:10 2014 UTC
Log: Remember liblouisutdml.def is in windows directory
http://code.google.com/p/liblouisutdml/source/detail?r=c9b145971012
Modified:
/SConstruct
=======================================
--- /SConstruct Thu Jun 26 08:47:12 2014 UTC
+++ /SConstruct Thu Jun 26 08:49:10 2014 UTC
@@ -80,7 +80,7 @@
liblouisLibDir = [os.path.join('..', 'liblouis')]
libxml2LibDir = [os.path.join('..', 'libxml2', 'lib')]
libDirs += libxml2LibDir + liblouisLibDir
- cSRCFiles += ['liblouisutdml.def']
+ cSRCFiles += ['windows/liblouisutdml.def']
# Due to Windows linking and names, we need to redefine the libs
liblouisutdmlDepLibs = ['liblouis', 'libxml2']
else:
==============================================================================
Revision: b63d47f1acb3
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 08:52:54 2014 UTC
Log: Fix another name issue
http://code.google.com/p/liblouisutdml/source/detail?r=b63d47f1acb3
Modified:
/SConstruct
=======================================
--- /SConstruct Thu Jun 26 08:49:10 2014 UTC
+++ /SConstruct Thu Jun 26 08:52:54 2014 UTC
@@ -82,7 +82,7 @@
libDirs += libxml2LibDir + liblouisLibDir
cSRCFiles += ['windows/liblouisutdml.def']
# Due to Windows linking and names, we need to redefine the libs
- liblouisutdmlDepLibs = ['liblouis', 'libxml2']
+ louisutdmlDepLibs = ['liblouis', 'libxml2']
else:
print('pkg-config >= 0.15.0 not found.')
Exit(1)
==============================================================================
Revision: 3acf3ce7b0ae
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 10:19:40 2014 UTC
Log: Fix typo in JAVA_HOME environment variable name
http://code.google.com/p/liblouisutdml/source/detail?r=3acf3ce7b0ae
Modified:
/SConstruct
=======================================
--- /SConstruct Thu Jun 26 08:52:54 2014 UTC
+++ /SConstruct Thu Jun 26 10:19:40 2014 UTC
@@ -58,7 +58,7 @@
env = Environment()
# Add JAVA_HOME paths if defined in environment variables
-javaHome = os.environ.get('HAVA_HOME')
+javaHome = os.environ.get('JAVA_HOME')
if javaHome:
env.Append(CPPPATH=[os.path.join(javaHome, 'include'),
os.path.join(javaHome, 'include', 'win32')])
==============================================================================
Revision: 4f0e12022362
Branch: scons-build
Author: Michael Whapples
Date: Thu Jun 26 11:06:26 2014 UTC
Log: Added linux subdirectory of JDK include directory to includes
http://code.google.com/p/liblouisutdml/source/detail?r=4f0e12022362
Modified:
/SConstruct
=======================================
--- /SConstruct Thu Jun 26 10:19:40 2014 UTC
+++ /SConstruct Thu Jun 26 11:06:26 2014 UTC
@@ -60,8 +60,10 @@
# Add JAVA_HOME paths if defined in environment variables
javaHome = os.environ.get('JAVA_HOME')
if javaHome:
- env.Append(CPPPATH=[os.path.join(javaHome, 'include'),
- os.path.join(javaHome, 'include', 'win32')])
+ javaInc = os.path.join(javaHome, 'include')
+ env.Append(CPPPATH=[os.path.join(javaInc),
+ os.path.join(javaInc 'win32'),
+ os.path.join(javaInc, 'linux')])
# Now configure for the system
conf = Configure(env,
For a description of the software, to download it and links to
project pages go to http://www.abilitiessoft.com
Other related posts:
