Changeset 7749646 in mainline

Timestamp:

2019-08-17T12:49:44Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6068476

Parents:

e3737eda

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-16 17:44:58)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:44)

Message:

Add tools/export.sh to replace make export

Files:

• meson/part/exports/meson.build (modified) (2 diffs)
• meson/part/initrd/install_devel.sh.in (added)
• meson/part/initrd/meson.build (modified) (2 diffs)
• tools/README (added)
• tools/export.sh (added)
• uspace/lib/c/meson.build (modified) (1 diff)
• uspace/lib/meson.build (modified) (2 diffs)
• uspace/lib/posix/meson.build (modified) (1 diff)

meson/part/exports/meson.build

@@ -9 +9 @@
 
 export_cppflags = [
-        '-isystem', '$(HELENOS_EXPORT_ROOT)/include/posix',
+        '-isystem', '$(HELENOS_EXPORT_ROOT)/include/libposix',
         '-isystem', '$(HELENOS_EXPORT_ROOT)/include/libc',
         '-idirafter', '$(HELENOS_EXPORT_ROOT)/include',
@@ -56 +56 @@
         capture: true,
 )
-
-install_files += [[ 'config', meson.current_build_dir() / 'config.mk', 'config.mk' ]]
-install_deps += [ config_mk ]
-install_files += [[ 'config', meson.current_build_dir() / 'config.sh', 'config.sh' ]]
-install_deps += [ config_sh ]

meson/part/initrd/meson.build

@@ -31 +31 @@
 endforeach
 
+if CONFIG_DEVEL_FILES
+        install_script_text += uspace_lib_devel_install_script_text
+endif
+
+install_devel_script = configure_file(
+        configuration: { 'text' : '\n'.join(uspace_lib_devel_install_script_text) },
+        input: 'install_devel.sh.in',
+        output: 'install_devel.sh',
+)
+
 install_script_text += uspace_lib_install_script_text
 
@@ -42 +52 @@
 
 dist_dir = meson.build_root() / 'dist/'
+
+run_target('devel-headers',
+        command: [ sh, install_devel_script, dist_dir ],
+)
 
 dist = custom_target('DIST',

uspace/lib/c/meson.build

@@ -21 +21 @@
 #        we should instead move the duplicated library parts into a shared location.
 
-if CONFIG_DEVEL_FILES
-        uspace_lib_install_script_text += 'mkdir -p "${DESTDIR}include/libc"'
-
-        foreach idir : incdirs
-                _sdir = meson.current_source_dir() / idir
-                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/libc"'.format(_sdir)
-        endforeach
-endif
+uspace_lib_devel_install_script_text += 'mkdir -p "${DESTDIR}include/libc"'
+foreach idir : incdirs
+        _sdir = meson.current_source_dir() / idir
+        uspace_lib_devel_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/libc"'.format(_sdir)
+endforeach
 
 src = [ arch_src ]

uspace/lib/meson.build

@@ -64 +64 @@
 
 # Text of the install script.
-uspace_lib_install_script_text = []
+uspace_lib_devel_install_script_text = []
 
 foreach l : libs
@@ -121 +121 @@
                         includes += include_directories(incdir)
 
-                        if CONFIG_DEVEL_FILES and installed_libs.contains(l)
+                        if installed_libs.contains(l)
                                 _sdir = meson.current_source_dir() / l / 'include'
-                                uspace_lib_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/lib@1@"'.format(_sdir, l)
+                                uspace_lib_devel_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/lib@1@"'.format(_sdir, l)
                         endif
                 else
                         includes += include_directories(l)
 
-                        if CONFIG_DEVEL_FILES and installed_libs.contains(l)
+                        if installed_libs.contains(l)
                                 _sdir = meson.current_source_dir() / l
-                                uspace_lib_install_script_text += 'mkdir -p "${DESTDIR}include/lib@0@"'.format(l)
-                                uspace_lib_install_script_text += 'cp -L -t "${DESTDIR}include/lib@0@" "@1@"/*.h || true'.format(l, _sdir)
+                                uspace_lib_devel_install_script_text += 'mkdir -p "${DESTDIR}include/lib@0@"'.format(l)
+                                uspace_lib_devel_install_script_text += 'cp -L -t "${DESTDIR}include/lib@0@" "@1@"/*.h || true'.format(l, _sdir)
                         endif
                 endif

uspace/lib/posix/meson.build

@@ -34 +34 @@
 )
 
+_sdir = meson.current_source_dir() / 'include' / 'posix'
+uspace_lib_devel_install_script_text += 'mkdir -p "${DESTDIR}include/libposix"'
+uspace_lib_devel_install_script_text += 'cp -R -L -T "@0@" "${DESTDIR}include/libposix"'.format(_sdir)
+
 # TODO: exports