Skip to content

Commit 98103db

Browse files
committed
waf: Replace --install-csp with waf install
The option --install-csp was introduced in the commit ebe19dc. But waf can distiguish build and install via ctx.is_install. https://waf.io/apidocs/Build.html#waflib.Build.BuildContext.is_install Thus, this commit replaces --install-csp with waf install. Signed-off-by: Yasushi SHOJI <[email protected]>
1 parent b0653b8 commit 98103db

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CHANGELOG

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ libcsp 2.0, xx-yy-zzzz
2121
- improvement: Portability. No more use of packed bitfields.
2222
- improvement: RDP RX/TX queue is now global, saving a lot of memory
2323
- improvement: FreeRTOS now uses taskNotify API instead of binary semaphores
24+
- removed: --install-csp option from waf (replaced with `waf install`)
2425
- removed: XTEA has been removed, use a dedicated encryption library instead
2526
- removed: csp_endian.h: Use the system provided <endian.h> instead (which is faster and smaller)
2627
- removed: csp_malloc.h: libcsp no longer uses dynamic allocation

wscript

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ def options(ctx):
1717
# Set libcsp options
1818
gr = ctx.add_option_group('libcsp options')
1919
gr.add_option('--includes', default='', help='Add additional include paths, separate with comma')
20-
gr.add_option('--install-csp', action='store_true', help='Installs CSP headers and lib')
2120

2221
gr.add_option('--disable-output', action='store_true', help='Disable CSP output')
2322
gr.add_option('--disable-print-stdio', action='store_true', help='Disable vprintf for csp_print_func')
@@ -180,7 +179,7 @@ def build(ctx):
180179

181180
# Set install path for header files
182181
install_path = None
183-
if ctx.options.install_csp:
182+
if ctx.is_install:
184183
install_path = '${PREFIX}/lib'
185184
ctx.install_files('${PREFIX}/include/csp',
186185
ctx.path.ant_glob('include/csp/**/*.h'),

0 commit comments

Comments
 (0)