anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-05 13:26:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.lyx.org:lyx

Browse Source
This commit is contained in:
Stephan Witt 2012-07-30 14:34:12 +02:00
commit a9de2597ed
5 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -668,6 +668,7 @@ endif()
add_subdirectory(src "${TOP_BINARY_DIR}/src")
add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")
add_subdirectory(lib/scripts "${TOP_BINARY_DIR}/scripts")
add_subdirectory(lib/examples "${TOP_BINARY_DIR}/lib/examples")
if(LYX_INSTALL)

11
lib/examples/CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
# This file is part of LyX, the document processor.
# Licence details can be found in the file COPYING.
#
# Copyright (c) 2012 Kornel Benko, <kornel@lyx.org>
#
project(test)
foreach(_arg longsheet.gnumeric iecc05.fen beamer-icsi-logo.pdf)
configure_file(${_arg} "${CMAKE_CURRENT_BINARY_DIR}/${_arg}" COPYONLY)
endforeach(_arg)

2
src/tex2lyx/CMakeLists.txt
View File

@ -63,6 +63,8 @@ endif()
project_source_group("${GROUP_CODE}" tex2lyx_sources tex2lyx_headers)
add_subdirectory(test)
if(LYX_BUNDLE)
install(TARGETS ${_tex2lyx}
RUNTIME DESTINATION bin

36
src/tex2lyx/test/CMakeLists.txt Normal file
View File

@ -0,0 +1,36 @@
# This file is part of LyX, the document processor.
# Licence details can be found in the file COPYING.
#
# Copyright (c) 2012 Kornel Benko, <kornel@lyx.org>
#
project(test)
set(_test_depend "${CMAKE_CURRENT_BINARY_DIR}/test.ltx")
set(_test_output "${CMAKE_CURRENT_BINARY_DIR}/test.lyx.tex")
foreach(_arg runtests.py DummyDocument.tex test.ltx foo.eps foo.png)
configure_file("${TOP_SRC_DIR}/src/tex2lyx/test/${_arg}" "${CMAKE_CURRENT_BINARY_DIR}/${_arg}" COPYONLY)
endforeach(_arg)
foreach(_arg test-structure test-insets box-color-size-space-align CJK XeTeX-polyglossia)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_arg}.tex"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${TOP_SRC_DIR}/src/tex2lyx/test/${_arg}.tex" "${CMAKE_CURRENT_BINARY_DIR}/${_arg}.tex"
DEPENDS "${TOP_SRC_DIR}/src/tex2lyx/test/${_arg}.tex"
)
list(APPEND _test_depend "${CMAKE_CURRENT_BINARY_DIR}/${_arg}.tex")
list(APPEND _test_output "${CMAKE_CURRENT_BINARY_DIR}/${_arg}.lyx.tex")
list(APPEND _test_output "${CMAKE_CURRENT_BINARY_DIR}/${_arg}.lyx.lyx")
endforeach(_arg)
ADD_CUSTOM_COMMAND(
OUTPUT ${_test_output}
COMMAND ${LYX_PYTHON_EXECUTABLE}
ARGS "${CMAKE_CURRENT_BINARY_DIR}/runtests.py" "${TOP_BINARY_DIR}/bin/${_tex2lyx}" "${TOP_SRC_DIR}/lib/scripts"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
DEPENDS ${_tex2lyx} ${_test_depend}
COMMENT "${LYX_PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/runtests.py" "${TOP_BINARY_DIR}/bin/${_tex2lyx}" "${TOP_SRC_DIR}/lib/scripts"
)
ADD_CUSTOM_TARGET(test DEPENDS ${_tex2lyx} ${_lyx} ${_test_output})

12
src/tex2lyx/test/runtests.py
View File

@ -15,17 +15,21 @@ import os, string, sys
def usage(prog_name):
return "Usage: %s [<tex2lyx binary>]" % prog_name
return "Usage: %s [<tex2lyx binary> [<script dir>]]" % prog_name
def main(argv):
# Parse and manipulate the command line arguments.
sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../../lib/scripts'))
if len(argv) == 3:
sys.path.append(os.path.join(sys.argv[2]))
else:
sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../../../lib/scripts'))
from lyxpreview_tools import error
if len(argv) == 1:
if len(argv) < 2:
tex2lyx = './tex2lyx'
elif len(argv) == 2:
elif len(argv) <= 3:
tex2lyx = argv[1]
else:
error(usage(argv[0]))