From d3dbb150988aba0647e0a9b0bba862bc26f16548 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Sun, 5 Jan 2014 16:59:27 +0400 Subject: [PATCH] Successful compilation under GNU/Linux. --- CMakeLists.txt | 16 ++++ cmake/FindVala.cmake | 69 +++++++++++++++ cmake/UseVala.cmake | 180 ++++++++++++++++++++++++++++++++++++++ src/AddSpace.vala | 0 src/AddSpaces.vala | 0 src/CMakeLists.txt | 18 ++++ src/Cell.vala | 0 src/ColParam.vala | 0 src/ColParams.vala | 0 src/Doc.vala | 0 src/Glob.vala | 0 src/GlobScanner.vala | 0 src/Graphics.vala | 0 src/GraphicsScanner.vala | 0 src/Longtable.vala | 0 src/LongtableScanner.vala | 0 src/Object.vala | 0 src/ObjectList.vala | 0 src/Row.vala | 0 src/Scanner.vala | 0 src/Subtable.vala | 0 src/Tabular.vala | 0 src/TabularScanner.vala | 0 src/Text.vala | 0 src/TextScanner.vala | 0 src/main.vala | 15 ++++ 26 files changed, 298 insertions(+) create mode 100644 CMakeLists.txt create mode 100644 cmake/FindVala.cmake create mode 100644 cmake/UseVala.cmake create mode 100644 src/AddSpace.vala create mode 100644 src/AddSpaces.vala create mode 100644 src/CMakeLists.txt create mode 100644 src/Cell.vala create mode 100644 src/ColParam.vala create mode 100644 src/ColParams.vala create mode 100644 src/Doc.vala create mode 100644 src/Glob.vala create mode 100644 src/GlobScanner.vala create mode 100644 src/Graphics.vala create mode 100644 src/GraphicsScanner.vala create mode 100644 src/Longtable.vala create mode 100644 src/LongtableScanner.vala create mode 100644 src/Object.vala create mode 100644 src/ObjectList.vala create mode 100644 src/Row.vala create mode 100644 src/Scanner.vala create mode 100644 src/Subtable.vala create mode 100644 src/Tabular.vala create mode 100644 src/TabularScanner.vala create mode 100644 src/Text.vala create mode 100644 src/TextScanner.vala create mode 100644 src/main.vala diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..90ec0ab --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,16 @@ +CMAKE_MINIMUM_REQUIRED (VERSION 2.8) + +PROJECT (LAview C) + +SET (LAVIEW_VERSION_MAJOR 0) +SET (LAVIEW_VERSION_MINOR 0) +SET (LAVIEW_VERSION_PATCH 1) +SET (LAVIEW_VERSION + ${LAVIEW_VERSION_MAJOR}.${LAVIEW_VERSION_MINOR}.${LAVIEW_VERSION_PATCH}) + +LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) + +INCLUDE (FindVala) +INCLUDE (UseVala) + +ADD_SUBDIRECTORY (src) diff --git a/cmake/FindVala.cmake b/cmake/FindVala.cmake new file mode 100644 index 0000000..c8854ce --- /dev/null +++ b/cmake/FindVala.cmake @@ -0,0 +1,69 @@ +## +# Find module for the Vala compiler (valac) +# +# This module determines wheter a Vala compiler is installed on the current +# system and where its executable is. +# +# Call the module using "find_package(Vala) from within your CMakeLists.txt. +# +# The following variables will be set after an invocation: +# +# VALA_FOUND Whether the vala compiler has been found or not +# VALA_EXECUTABLE Full path to the valac executable if it has been found +# VALA_VERSION Version number of the available valac +# VALA_USE_FILE Include this file to define the vala_precompile function +## + +## +# Copyright 2009-2010 Jakob Westhoff. All rights reserved. +# Copyright 2010-2011 Daniel Pfeifer +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# The views and conclusions contained in the software and documentation are those +# of the authors and should not be interpreted as representing official policies, +# either expressed or implied, of Jakob Westhoff +## + +# Search for the valac executable in the usual system paths. +find_program(VALA_EXECUTABLE valac) +mark_as_advanced(VALA_EXECUTABLE) + +# Determine the valac version +if(VALA_EXECUTABLE) + execute_process(COMMAND ${VALA_EXECUTABLE} "--version" + OUTPUT_VARIABLE VALA_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + string(REPLACE "Vala " "" VALA_VERSION "${VALA_VERSION}") +endif(VALA_EXECUTABLE) + +# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call. +# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka. +# VALA_EXECUTABLE is set) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Vala + REQUIRED_VARS VALA_EXECUTABLE + VERSION_VAR VALA_VERSION) + +set(VALA_USE_FILE "${CMAKE_CURRENT_LIST_DIR}/UseVala.cmake") + diff --git a/cmake/UseVala.cmake b/cmake/UseVala.cmake new file mode 100644 index 0000000..436d1d0 --- /dev/null +++ b/cmake/UseVala.cmake @@ -0,0 +1,180 @@ +## +# Compile vala files to their c equivalents for further processing. +# +# The "vala_precompile" function takes care of calling the valac executable on +# the given source to produce c files which can then be processed further using +# default cmake functions. +# +# The first parameter provided is a variable, which will be filled with a list +# of c files outputted by the vala compiler. This list can than be used in +# conjuction with functions like "add_executable" or others to create the +# neccessary compile rules with CMake. +# +# The following sections may be specified afterwards to provide certain options +# to the vala compiler: +# +# SOURCES +# A list of .vala files to be compiled. Please take care to add every vala +# file belonging to the currently compiled project or library as Vala will +# otherwise not be able to resolve all dependencies. +# +# PACKAGES +# A list of vala packages/libraries to be used during the compile cycle. The +# package names are exactly the same, as they would be passed to the valac +# "--pkg=" option. +# +# OPTIONS +# A list of optional options to be passed to the valac executable. This can be +# used to pass "--thread" for example to enable multi-threading support. +# +# CUSTOM_VAPIS +# A list of custom vapi files to be included for compilation. This can be +# useful to include freshly created vala libraries without having to install +# them in the system. +# +# GENERATE_VAPI +# Pass all the needed flags to the compiler to create an internal vapi for +# the compiled library. The provided name will be used for this and a +# .vapi file will be created. +# +# GENERATE_HEADER +# Let the compiler generate a header file for the compiled code. There will +# be a header file as well as an internal header file being generated called +# .h and _internal.h +# +# The following call is a simple example to the vala_precompile macro showing +# an example to every of the optional sections: +# +# find_package(Vala "0.12" REQUIRED) +# inlcude(${VALA_USE_FILE}) +# +# vala_precompile(VALA_C +# SOURCES +# source1.vala +# source2.vala +# source3.vala +# PACKAGES +# gtk+-2.0 +# gio-1.0 +# posix +# DIRECTORY +# gen +# OPTIONS +# --thread +# CUSTOM_VAPIS +# some_vapi.vapi +# GENERATE_VAPI +# myvapi +# GENERATE_HEADER +# myheader +# ) +# +# Most important is the variable VALA_C which will contain all the generated c +# file names after the call. +## + +## +# Copyright 2009-2010 Jakob Westhoff. All rights reserved. +# Copyright 2010-2011 Daniel Pfeifer +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# The views and conclusions contained in the software and documentation are those +# of the authors and should not be interpreted as representing official policies, +# either expressed or implied, of Jakob Westhoff +## + +include(CMakeParseArguments) + +function(vala_precompile output) + cmake_parse_arguments(ARGS "" "DIRECTORY;GENERATE_HEADER;GENERATE_VAPI" + "SOURCES;PACKAGES;OPTIONS;CUSTOM_VAPIS" ${ARGN}) + + if(ARGS_DIRECTORY) + set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY}) + else(ARGS_DIRECTORY) + set(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + endif(ARGS_DIRECTORY) + include_directories(${DIRECTORY}) + set(vala_pkg_opts "") + foreach(pkg ${ARGS_PACKAGES}) + list(APPEND vala_pkg_opts "--pkg=${pkg}") + endforeach(pkg ${ARGS_PACKAGES}) + set(in_files "") + set(out_files "") + foreach(src ${ARGS_SOURCES} ${ARGS_UNPARSED_ARGUMENTS}) + list(APPEND in_files "${CMAKE_CURRENT_SOURCE_DIR}/${src}") + string(REPLACE ".vala" ".c" src ${src}) + string(REPLACE ".gs" ".c" src ${src}) + set(out_file "${DIRECTORY}/${src}") + list(APPEND out_files "${DIRECTORY}/${src}") + endforeach(src ${ARGS_SOURCES} ${ARGS_UNPARSED_ARGUMENTS}) + + set(custom_vapi_arguments "") + if(ARGS_CUSTOM_VAPIS) + foreach(vapi ${ARGS_CUSTOM_VAPIS}) + if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) + list(APPEND custom_vapi_arguments ${vapi}) + else (${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) + list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi}) + endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) + endforeach(vapi ${ARGS_CUSTOM_VAPIS}) + endif(ARGS_CUSTOM_VAPIS) + + set(vapi_arguments "") + if(ARGS_GENERATE_VAPI) + list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi") + set(vapi_arguments "--internal-vapi=${ARGS_GENERATE_VAPI}.vapi") + + # Header and internal header is needed to generate internal vapi + if (NOT ARGS_GENERATE_HEADER) + set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI}) + endif(NOT ARGS_GENERATE_HEADER) + endif(ARGS_GENERATE_VAPI) + + set(header_arguments "") + if(ARGS_GENERATE_HEADER) + list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}.h") + list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h") + list(APPEND header_arguments "--header=${DIRECTORY}/${ARGS_GENERATE_HEADER}.h") + list(APPEND header_arguments "--internal-header=${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h") + endif(ARGS_GENERATE_HEADER) + + add_custom_command(OUTPUT ${out_files} + COMMAND + ${VALA_EXECUTABLE} + ARGS + "-C" + ${header_arguments} + ${vapi_arguments} + "-b" ${CMAKE_CURRENT_SOURCE_DIR} + "-d" ${DIRECTORY} + ${vala_pkg_opts} + ${ARGS_OPTIONS} + ${in_files} + ${custom_vapi_arguments} + DEPENDS + ${in_files} + ${ARGS_CUSTOM_VAPIS} + ) + set(${output} ${out_files} PARENT_SCOPE) +endfunction(vala_precompile) diff --git a/src/AddSpace.vala b/src/AddSpace.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/AddSpaces.vala b/src/AddSpaces.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..37e1e21 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,18 @@ +FIND_PACKAGE (PkgConfig REQUIRED) + +PKG_CHECK_MODULES (GLIB REQUIRED glib-2.0) +INCLUDE_DIRECTORIES (${GLIB_INCLUDE_DIRS}) +LINK_DIRECTORIES (${GLIB_LIBRARY_DIRS}) + +FILE (GLOB_RECURSE LAviewSources RELATIVE ${CMAKE_SOURCE_DIR}/src *.vala) +VALA_PRECOMPILE (VALA_C ${LAviewSources} + PACKAGES + OPTIONS --thread + CUSTOM_VAPIS + GENERATE_VAPI laview + GENERATE_HEADER laview + ) +ADD_LIBRARY (laview SHARED ${VALA_C}) +TARGET_LINK_LIBRARIES (laview ${GLIB2_LIBRARIES}) +SET_TARGET_PROPERTIES (laview PROPERTIES VERSION ${LAVIEW_VERSION}) +SET_TARGET_PROPERTIES (laview PROPERTIES SOVERSION ${LAVIEW_VERSION_MAJOR}) diff --git a/src/Cell.vala b/src/Cell.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/ColParam.vala b/src/ColParam.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/ColParams.vala b/src/ColParams.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/Doc.vala b/src/Doc.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/Glob.vala b/src/Glob.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/GlobScanner.vala b/src/GlobScanner.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/Graphics.vala b/src/Graphics.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/GraphicsScanner.vala b/src/GraphicsScanner.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/Longtable.vala b/src/Longtable.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/LongtableScanner.vala b/src/LongtableScanner.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/Object.vala b/src/Object.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/ObjectList.vala b/src/ObjectList.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/Row.vala b/src/Row.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/Scanner.vala b/src/Scanner.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/Subtable.vala b/src/Subtable.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/Tabular.vala b/src/Tabular.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/TabularScanner.vala b/src/TabularScanner.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/Text.vala b/src/Text.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/TextScanner.vala b/src/TextScanner.vala new file mode 100644 index 0000000..e69de29 diff --git a/src/main.vala b/src/main.vala new file mode 100644 index 0000000..82ff429 --- /dev/null +++ b/src/main.vala @@ -0,0 +1,15 @@ +namespace LAview { + public errordomain ParseError { + UNEXPECTED_SYMBOL, + } + + public void parse(string text) throws ParseError { + print("TeX successfully parsed!\n"); + if (0 != 0) + throw new ParseError.UNEXPECTED_SYMBOL("Parsing error!"); + } + + public string plain_to_tex(string text) { + return "Parsed text here..."; + } +}