cppan
diff --git a/‎cppan.yml‎
Lines changed: 3 additions & 3 deletions b/‎cppan.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/driver/cpp/options_cl.yml‎
Lines changed: 109 additions & 2 deletions b/‎src/driver/cpp/options_cl.yml‎
Lines changed: 109 additions & 2 deletions
@@ -234,12 +234,12 @@ projects:
             )
             set(src ${src} ${f})
 
-            set(f ${BDIR}/options_cl.generated.h ${BDIR}/options_cl.generated.cpp)
+            set(f ${BDIR}/options_cl.generated.h)
             add_custom_command(OUTPUT ${f}
-                COMMAND ${cl_generator} ${SDIR}/src/driver/cpp/options_cl.yml ${f}
+                COMMAND ${cl_generator} ${SDIR}/src/driver/cpp/options_cl.yml ${f} ${BDIR}/options_cl.generated.cpp
                 DEPENDS ${cl_generator} ${SDIR}/src/driver/cpp/options_cl.yml
             )
-            set(src ${src} ${f})
+            set(src ${src} ${f} ${SDIR}/src/driver/cpp/options_cl.yml)
 
         post_target: |
             cppan_flex_bison_internal(src/driver/cpp/bazel/lexer.ll PARSERS src/driver/cpp/bazel/grammar.yy)
 
@@ -105,6 +105,7 @@ types:
             cppstd:
                 name: CPPStandard
                 type: CPPLanguageStandard
+                function_current: getCommandLineImplCPPLanguageStandardVS
                 function: |
                     String s = "-std:c++";
                     switch (v)
@@ -190,7 +191,7 @@ types:
             exh:
                 name: ExceptionHandlingModel
                 type: vs::ExceptionHandlingVector
-                value: vs::ExceptionHandlingVector{ vs::ExceptionHandling{} }
+                default: vs::ExceptionHandlingVector{ vs::ExceptionHandling{} }
 
                 struct: |
                     struct ExceptionHandling
@@ -261,7 +262,7 @@ types:
                 flag: Fd
                 type: path
                 properties:
-                    - intermediate_dependency
+                    - intermediate_file
 
             pchfn:
                 name: PrecompiledHeaderFilename
@@ -400,9 +401,115 @@ types:
                     - csf
                     - cppsf
 
+    # common for lib.exe and link.exe
+    # https://docs.microsoft.com/en-us/cpp/build/reference/linker-options
+    vslt:
+        name: VisualStudioLibraryToolOptions
+        parent: VisualStudioCommonOptions
+
+        flags:
+            ifiles:
+                name: InputFiles
+                type: Files
+                properties:
+                    - input_dependency
+
+            lds:
+                name: LinkDirectories
+                type: FilesOrdered
+                flag: "LIBPATH:"
+                properties:
+                    - input_dependency
+                    - flag_before_each_value
+
+            mt:
+                name: Machine
+                type: vs::MachineType
+                flag: "MACHINE:"
+                default: vs::MachineType::X64
 
+            def:
+                name: DefinitionFile
+                type: path
+                flag: "DEF:"
+                properties:
+                    - input_dependency
 
+            implib:
+                name: ImportLibrary
+                type: path
+                flag: "IMPLIB:"
+                properties:
+                    # why? implib must present for dlls
+                    # some dlls might be generated without implibs for dynamic loading only
+                    - intermediate_file
 
+            out:
+                name: Output
+                type: path
+                flag: "OUT:"
+                properties:
+                    - output_dependency
 
+    vslib:
+        name: VisualStudioLibrarianOptions
 
+    # https://docs.microsoft.com/en-us/cpp/build/reference/linker-options
+    vslink:
+        name: VisualStudioLinkerOptions
 
+        flags:
+            ild:
+                name: InputLibraryDependencies
+                type: FilesOrdered
+                properties:
+                    - input_dependency
+
+            dll:
+                name: Dll
+                type: bool
+                flag: "DLL:"
+                properties:
+                    - config_variable
+
+            delay:
+                name: DelayLoadDlls
+                type: FilesOrdered
+                flag: "DELAYLOAD:"
+                properties:
+                    - flag_before_each_value
+
+            dbg:
+                name: GenerateDebugInfo
+                type: bool
+                flag: DEBUG
+
+            frc:
+                name: Force
+                type: vs::ForceType
+                flag: "FORCE:"
+
+            pdb:
+                name: PDBFilename
+                type: path
+                flag: "PDB:"
+                properties:
+                    - output_dependency
+
+            noentr:
+                name: NoEntry
+                type: bool
+                flag: NOENTRY
+
+            sub:
+                name: Subsystem
+                type: vs::Subsystem
+                flag: "SUBSYSTEM:"
+                default: vs::Subsystem::Console
+
+            ignw:
+                name: IgnoreWarnings
+                type: std::set<int>
+                flag: "IGNORE:"
+                properties:
+                    - flag_before_each_value
Original file line number	Diff line number	Diff line change
`@@ -234,12 +234,12 @@ projects:`
`234`	`234`	`)`
`235`	`235`	`set(src ${src} ${f})`
`236`	`236`
`237`		`- set(f ${BDIR}/options_cl.generated.h ${BDIR}/options_cl.generated.cpp)`
	`237`	`+ set(f ${BDIR}/options_cl.generated.h)`
`238`	`238`	`add_custom_command(OUTPUT ${f}`
`239`		`- COMMAND ${cl_generator} ${SDIR}/src/driver/cpp/options_cl.yml ${f}`
	`239`	`+ COMMAND ${cl_generator} ${SDIR}/src/driver/cpp/options_cl.yml ${f} ${BDIR}/options_cl.generated.cpp`
`240`	`240`	`DEPENDS ${cl_generator} ${SDIR}/src/driver/cpp/options_cl.yml`
`241`	`241`	`)`
`242`		`- set(src ${src} ${f})`
	`242`	`+ set(src ${src} ${f} ${SDIR}/src/driver/cpp/options_cl.yml)`
`243`	`243`
`244`	`244`	`post_target: \|`
`245`	`245`	`cppan_flex_bison_internal(src/driver/cpp/bazel/lexer.ll PARSERS src/driver/cpp/bazel/grammar.yy)`