Skip to content

Commit 1a35a35

Browse files
committed
no short name command line option of cib
1 parent 7b7ecfe commit 1a35a35

File tree

50 files changed

+289
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+289
-291
lines changed

.vscode/launch.json

Lines changed: 226 additions & 226 deletions
Large diffs are not rendered by default.

demo/1-simple-class/library/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ foreach(CIBOUTFILE ${CIB_OUTPUT})
3636
endforeach()
3737
add_custom_command(
3838
OUTPUT ${CIB_OUTPUT}
39-
COMMAND ${CIB} -i pub -o exp -b cib -m Demo --apidecor=EXAMPLE_API -c ${CMAKE_CURRENT_SOURCE_DIR}/abi/__zz_cib_Demo-ids.h >${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/dev.null
39+
COMMAND ${CIB} --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Demo --apidecor=EXAMPLE_API --cib-ids-file ${CMAKE_CURRENT_SOURCE_DIR}/abi/__zz_cib_Demo-ids.h >${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/dev.null
4040
DEPENDS cib ${LIBRARY_PUB_FILES}
4141
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
4242
)

demo/2-interface-class/library/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ foreach(CIBOUTFILE ${CIB_OUTPUT})
3333
endforeach()
3434
add_custom_command(
3535
OUTPUT ${CIB_OUTPUT}
36-
COMMAND ${CIB} -i pub -o exp -b cib -m Demo --apidecor=EXAMPLE_API -c ${CMAKE_CURRENT_SOURCE_DIR}/abi/__zz_cib_Demo-ids.h >${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/dev.null
36+
COMMAND ${CIB} --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Demo --apidecor=EXAMPLE_API --cib-ids-file ${CMAKE_CURRENT_SOURCE_DIR}/abi/__zz_cib_Demo-ids.h >${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/dev.null
3737
DEPENDS cib ${LIBRARY_PUB_FILES}
3838
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
3939
)

demo/3-template-class/library/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ foreach(CIBOUTFILE ${CIB_OUTPUT})
3434
endforeach()
3535
add_custom_command(
3636
OUTPUT ${CIB_OUTPUT}
37-
COMMAND ${CIB} -i pub -o exp -b cib -m Demo --apidecor=EXAMPLE_API -c ${CMAKE_CURRENT_SOURCE_DIR}/abi/__zz_cib_template-class-ids.h >${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/dev.null
37+
COMMAND ${CIB} --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Demo --apidecor=EXAMPLE_API --cib-ids-file ${CMAKE_CURRENT_SOURCE_DIR}/abi/__zz_cib_template-class-ids.h >${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/dev.null
3838
DEPENDS cib ${LIBRARY_PUB_FILES}
3939
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
4040
)

examples/0010-simple-class/README.md

Lines changed: 1 addition & 1 deletion

examples/0010-simple-class/README.mdpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CIB is expected to be run with public headers that a library wants to publish.
2121
Assuming `pub/` is the folder that contains public headers that library wants to publish and current working directory is `examples/0010-simple-class/` we can run CIB as shown below:
2222

2323
```shell
24-
cib -i pub/ -o exp/ -b cib/ -m Example
24+
cib --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example
2525
```
2626

2727
After above command we will see quite a good number of files created in folders `cib/` and `exp/`.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include("${example_ROOT}/common.cmake")
22

3-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example -c ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
3+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example --cib-ids-file ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
44
set(DEPENDS ${PREV_TEST_NAME}_lib)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include("${example_ROOT}/common.cmake")
22

3-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example -c ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
3+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example --cib-ids-file ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
44
set(DEPENDS ${PREV_TEST_NAME}_lib)

examples/0040-shared-class-and-object-reuse/Prologue.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ set(PUB_FILE_BASE_NAMES
66
B
77
)
88

9-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example -c ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
9+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example --cib-ids-file ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
1010
set(DEPENDS ${PREV_TEST_NAME}_lib)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
set(CIBCMD ${CIB} -i pub -o exp -b cib -m Example)
1+
set(CIBCMD ${CIB} --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example)
22

examples/0050-virtual-function/README.md

Lines changed: 1 addition & 1 deletion

examples/0050-virtual-function/README.mdpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Let's now run CIB:
1111
**Running cib**
1212

1313
```sh
14-
cib -i pub/ -o exp/ -b cib/ -m Example
14+
cib --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example
1515
```
1616

1717
Below is what client of library can expect. It is trivial and there is no surprise but it is being done in **ABI compatible and stable** way.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include("${example_ROOT}/common.cmake")
22

3-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example -c ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
3+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example --cib-ids-file ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
44
set(DEPENDS ${PREV_TEST_NAME}_lib)

examples/0060-virtual-function-and-bkwd-compatibility/README.md

Lines changed: 1 addition & 1 deletion

examples/0060-virtual-function-and-bkwd-compatibility/README.mdpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ As it can be seen that the new method caused a new entry in MethodTable and that
2525
To make CIB ensure ABI stability we needed to run cib with additional parameter and supply ID file of previous example:
2626

2727
```sh
28-
cib -i pub -o exp -b cib -m Example -c ../0050-virtual-function/cib/__zz_cib_Example-ids.h
28+
cib --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example -c ../0050-virtual-function/cib/__zz_cib_Example-ids.h
2929
```
3030

3131
This makes cib understand that we want ABI stability with previous example and CIB generates glue code accordingly.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include("${example_ROOT}/common.cmake")
22

3-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example -c ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
3+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example --cib-ids-file ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
44
set(DEPENDS ${PREV_TEST_NAME}_lib)

examples/0070-virtual-function-and-forwd-compatibility/README.md

Lines changed: 1 addition & 1 deletion

examples/0070-virtual-function-and-forwd-compatibility/README.mdpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Either don't call new functions if client's backward compatibility is desired or
1818
To make CIB ensure ABI stability we need to run cib with additional parameter to supply ID file of previous version of library:
1919

2020
```sh
21-
cib -i pub -o exp -b cib -m Example -c ../0050-virtual-function/cib/__zz_cib_Example-ids.h
21+
cib --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example -c ../0050-virtual-function/cib/__zz_cib_Example-ids.h
2222
```
2323

2424
This makes cib understand that we want ABI stability with binaries of `0050-virtual-function` example and CIB generates glue code accordingly.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include("${example_ROOT}/common.cmake")
22

3-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example -c ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
3+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example --cib-ids-file ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
44
set(DEPENDS ${PREV_TEST_NAME}_lib)

examples/0090-interface-class-and-bkwd-compatibility/README.md

Lines changed: 1 addition & 1 deletion

examples/0090-interface-class-and-bkwd-compatibility/README.mdpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ As it can be seen that the new method caused a new entry in MethodTable and that
2828
To make CIB ensures ABI stability we needed to run cib with additional parameter and supply ID file of previous example:
2929

3030
```sh
31-
cib -i pub -o exp -b cib -m Example -c ../0080-interface-class/cib/__zz_cib_Example-ids.h
31+
cib --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example -c ../0080-interface-class/cib/__zz_cib_Example-ids.h
3232
```
3333

3434
This makes cib understand that we want ABI stability with previous example and CIB generates glue code accordingly.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include("${example_ROOT}/common.cmake")
22

3-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example -c ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
3+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example --cib-ids-file ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
44
set(DEPENDS ${PREV_TEST_NAME}_lib)

examples/0100-interface-class-and-forwd-compatibility/README.md

Lines changed: 1 addition & 1 deletion

examples/0100-interface-class-and-forwd-compatibility/README.mdpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ There isn't much to talk about in this example, just that client is careful in i
2020
To make CIB ensures ABI stability we needed to run cib with additional parameter and supply ID file of previous example:
2121

2222
```sh
23-
cib -i pub -o exp -b cib -m Example -c ../0080-interface-class/cib/__zz_cib_Example-ids.h
23+
cib --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example -c ../0080-interface-class/cib/__zz_cib_Example-ids.h
2424
```
2525

2626
This makes cib understand that we want ABI stability with previous example and CIB generates glue code accordingly.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example)
1+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example)
1+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example)

examples/0310-intrusive-ptr/Prologue.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ list(APPEND EXP_SOURCES
88
${example_ROOT}/exp/SkRefCnt.cpp
99
)
1010

11-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example)
11+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example)

examples/0400-stl-template-classes/Prologue.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example)
1+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example)
22

33
list(APPEND EXP_SOURCES
44
${example_ROOT}/exp/C.cpp
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example)
1+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example --value-class CPoint --value-class Dummy)
1+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example --value-class CPoint --value-class Dummy)
22

examples/0620-function-overloading/README.md

Lines changed: 1 addition & 1 deletion

examples/0620-function-overloading/README.mdpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Assuming `pub/` is the folder that contains public headers that library wants to
2323
Assuming current working directory is `examples/0010-simple-class/` we can run CIB as shown below:
2424

2525
```shell
26-
cib -i pub/ -o exp/ -b cib/ -m Example
26+
cib --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example
2727
```
2828

2929
After above command we will see quite a good number of files created in folder cib/ and exp/.

examples/0630-operator-overloading/README.md

Lines changed: 1 addition & 1 deletion

examples/0630-operator-overloading/README.mdpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Assuming `pub/` is the folder that contains public headers that library wants to
2323
Assuming current working directory is `examples/0010-simple-class/` we can run CIB as shown below:
2424

2525
```shell
26-
cib -i pub/ -o exp/ -b cib/ -m Example
26+
cib --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example
2727
```
2828

2929
After above command we will see quite a good number of files created in folder cib/ and exp/.

examples/0640-protected-methods/README.md

Lines changed: 1 addition & 1 deletion

examples/0640-protected-methods/README.mdpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Assuming `pub/` is the folder that contains public headers that library wants to
2323
Assuming current working directory is `examples/0010-simple-class/` we can run CIB as shown below:
2424

2525
```shell
26-
cib -i pub/ -o exp/ -b cib/ -m Example
26+
cib --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example
2727
```
2828

2929
After above command we will see quite a good number of files created in folder cib/ and exp/.

examples/0710-exceptions/Prologue.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example --exception-class=CustomBaseException)
1+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example --exception-class=CustomBaseException)
22

33
list(APPEND EXP_SOURCES
44
${example_ROOT}/exp/__zz_cib_internal/__zz_cib_Example-exception-throw-on-error.cpp

examples/0710-exceptions/README.md

Lines changed: 1 addition & 1 deletion

examples/0710-exceptions/README.mdpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CIB is expected to be run with public headers that a library wants to publish.
2121
Assuming `pub/` is the folder that contains public headers that library wants to publish and current working directory is `examples/0010-simple-class/` we can run CIB as shown below:
2222

2323
```shell
24-
cib -i pub/ -o exp/ -b cib/ -m Example
24+
cib --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example
2525
```
2626

2727
After above command we will see quite a good number of files created in folders `cib/` and `exp/`.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include("${example_ROOT}/common.cmake")
22

3-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example -c ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
3+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example --cib-ids-file ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
44
set(DEPENDS ${PREV_TEST_NAME}_lib)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
include("${example_ROOT}/common.cmake")
22

3-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example -c ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
3+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example --cib-ids-file ${example_ROOT}/../${PREV_TEST_NAME}/cib/__zz_cib_Example-ids.h)
44
set(DEPENDS ${PREV_TEST_NAME}_lib)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example --interface-class=Interface)
1+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example --interface-class=Interface)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
set(CIBCMD $<TARGET_FILE:cib> -i pub -o exp -b cib -m Example --interface-class=Interface)
1+
set(CIBCMD $<TARGET_FILE:cib> --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example --interface-class=Interface)

examples/common.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ set(LIB_GLUE_SRCS
1616
)
1717
set(PUB_FILES "")
1818
set(EXP_SOURCES "")
19-
set(CIBCMD ${CIB} -i pub -o exp -b cib -m Example)
19+
set(CIBCMD ${CIB} --input-folder pub/ --output-folder exp/ --bind-folder cib/ --module Example)
2020
set(DEPENDS cib ${example}GlueCode)
2121
set(EXAMPLES_BIN_DIR ${CMAKE_BINARY_DIR}/examples)
2222
set(TEST_CMD ${EXAMPLES_BIN_DIR}/${CLIENTNAME})

0 commit comments

Comments
 (0)