Commit 4f956712 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

fill out more /new files

parent 916f80f1

.bzrignore

+2 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,8 @@ eeschema/cmp_library_keywords.* 
eeschema/template_fieldnames_keywords.*

eeschema/template_fieldnames_keywords.*

eeschema/template_fieldnames_lexer.h

eeschema/template_fieldnames_lexer.h

new/html

new/html

new/sch_lib_table_keywords.cpp

new/sch_lib_table_lexer.h

pcbnew/dialogs/dialog_freeroute_exchange_help_html.h

pcbnew/dialogs/dialog_freeroute_exchange_help_html.h

Makefile

Makefile

CMakeFiles

CMakeFiles

CMakeLists.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -120,6 +120,7 @@ mark_as_advanced(KICAD_BIN 
                 KICAD_DEMOS

                 KICAD_DEMOS

                 KICAD_TEMPLATE)

                 KICAD_TEMPLATE)





include(Functions)





#================================================

#================================================

# Find libraries that are needed to build KiCad.

# Find libraries that are needed to build KiCad.

CMakeModules/TokenList2DsnLexer.cmake

+6 −6
Original line number Original line Diff line number Diff line
@@ -144,8 +144,8 @@ set( sourceFileHeader 
 * your DSN lexer.

 * your DSN lexer.

 */

 */





#include \"fctsys.h\"

//#include \"fctsys.h\"

#include \"macros.h\"

//#include \"macros.h\"





#include \"${result}_lexer.h\"

#include \"${result}_lexer.h\"
@@ -241,9 +241,9 @@ public: 
    /**

    /**

     * Constructor ${RESULT}_LEXER

     * Constructor ${RESULT}_LEXER

     * takes @a aFile already opened for reading and @a aFilename as parameters.

     * takes @a aFile already opened for reading and @a aFilename as parameters.

     * The opened file is not closed by this class, and is assumed to be positioned

     * The opened file is assumed to be positioned at the beginning of the file

     * at the beginning of the file for purposes of accurate line number reporting

     * for purposes of accurate line number reporting in error messages.  The

     * in error messages.

     * FILE is closed by this instance when its destructor is called.

     * @param aFile is a FILE already opened for reading.

     * @param aFile is a FILE already opened for reading.

     * @param aFilename is the name of the opened file, needed for error reporting.

     * @param aFilename is the name of the opened file, needed for error reporting.

     */

     */
@@ -333,7 +333,7 @@ class ${RESULT}_PARSER : public ${RESULT}_LEXER 
file( APPEND "${outCppFile}"

file( APPEND "${outCppFile}"

"};

"};





const unsigned ${result}_keyword_count = DIM( ${result}_keywords );

const unsigned ${result}_keyword_count = unsigned( sizeof( ${result}_keywords )/sizeof( ${result}_keywords[0] ) );





}   // End namespace DSN

}   // End namespace DSN

"

"

common/CMakeLists.txt

+5 −19
Original line number Original line Diff line number Diff line
@@ -105,25 +105,11 @@ set(PCB_COMMON_SRCS 
add_library(pcbcommon ${PCB_COMMON_SRCS})

add_library(pcbcommon ${PCB_COMMON_SRCS})





# auto-generate netlist_lexer.h and netlist_keywords.cpp

# auto-generate netlist_lexer.h and netlist_keywords.cpp

set( inputFile      ${CMAKE_CURRENT_SOURCE_DIR}/netlist.keywords )

make_lexer(

set( outHeaderFile  ${PROJECT_SOURCE_DIR}/include/netlist_lexer.h )

    ${CMAKE_CURRENT_SOURCE_DIR}/netlist.keywords

set( outCppFile     ${CMAKE_CURRENT_SOURCE_DIR}/netlist_keywords.cpp )

    ${PROJECT_SOURCE_DIR}/include/netlist_lexer.h

set( enum           NL_T )

    ${CMAKE_CURRENT_SOURCE_DIR}/netlist_keywords.cpp

add_custom_command(

    NL_T

    OUTPUT  ${outHeaderFile}

            ${outCppFile}

    COMMAND ${CMAKE_COMMAND}

        -Denum=${enum}

        -DinputFile=${inputFile}

        -DoutHeaderFile=${outHeaderFile}

        -DoutCppFile=${outCppFile}

        -P ${CMAKE_MODULE_PATH}/TokenList2DsnLexer.cmake

    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/netlist.keywords

            ${CMAKE_MODULE_PATH}/TokenList2DsnLexer.cmake

    COMMENT "TokenList2DsnLexer.cmake creating:

       ${outHeaderFile} and

       ${outCppFile} from

       ${inputFile}"

    )

    )





# The dsntest may not build properly using MS Visual Studio.

# The dsntest may not build properly using MS Visual Studio.

eeschema/CMakeLists.txt

+11 −40
Original line number Original line Diff line number Diff line
@@ -170,47 +170,18 @@ endif(APPLE) 




# auto-generate cmp_library_lexer.h and cmp_library_keywords.cpp for the component

# auto-generate cmp_library_lexer.h and cmp_library_keywords.cpp for the component

# library format.

# library format.

set( inputFile      ${CMAKE_CURRENT_SOURCE_DIR}/cmp_library.keywords )

make_lexer(

set( outHeaderFile  ${CMAKE_CURRENT_SOURCE_DIR}/cmp_library_lexer.h )

   ${CMAKE_CURRENT_SOURCE_DIR}/cmp_library.keywords

set( outCppFile     ${CMAKE_CURRENT_SOURCE_DIR}/cmp_library_keywords.cpp )

   ${CMAKE_CURRENT_SOURCE_DIR}/cmp_library_lexer.h

set( enum           TLIB_T )

   ${CMAKE_CURRENT_SOURCE_DIR}/cmp_library_keywords.cpp

add_custom_command(

   TLIB_T

    OUTPUT  ${outHeaderFile}

            ${outCppFile}

    COMMAND ${CMAKE_COMMAND}

        -Denum=${enum}

        -DinputFile=${inputFile}

        -DoutHeaderFile=${outHeaderFile}

        -DoutCppFile=${outCppFile}

        -P ${CMAKE_MODULE_PATH}/TokenList2DsnLexer.cmake

    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/cmp_library.keywords

            ${CMAKE_MODULE_PATH}/TokenList2DsnLexer.cmake

    COMMENT "TokenList2DsnLexer.cmake creating:

       ${outHeaderFile} and

       ${outCppFile} from

       ${inputFile}"

   )

   )







make_lexer(

set( inputFile      ${CMAKE_CURRENT_SOURCE_DIR}/template_fieldnames.keywords )

    ${CMAKE_CURRENT_SOURCE_DIR}/template_fieldnames.keywords

set( outHeaderFile  ${CMAKE_CURRENT_SOURCE_DIR}/template_fieldnames_lexer.h )

    ${CMAKE_CURRENT_SOURCE_DIR}/template_fieldnames_lexer.h

set( outCppFile     ${CMAKE_CURRENT_SOURCE_DIR}/template_fieldnames_keywords.cpp )

    ${CMAKE_CURRENT_SOURCE_DIR}/template_fieldnames_keywords.cpp

set( enum           TFIELD_T )

    TFIELD_T

add_custom_command(

    OUTPUT  ${outHeaderFile}

            ${outCppFile}

    COMMAND ${CMAKE_COMMAND}

        -Denum=${enum}

        -DinputFile=${inputFile}

        -DoutHeaderFile=${outHeaderFile}

        -DoutCppFile=${outCppFile}

        -P ${CMAKE_MODULE_PATH}/TokenList2DsnLexer.cmake

    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/cmp_library.keywords

            ${CMAKE_MODULE_PATH}/TokenList2DsnLexer.cmake

    COMMENT "TokenList2DsnLexer.cmake creating:

       ${outHeaderFile} and

       ${outCppFile} from

       ${inputFile}"

    )

    )





add_executable(eeschema WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SRCS}

add_executable(eeschema WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SRCS}