Changeset 05d97eef 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:

58ef532

Parents:

6068476

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-21 12:32:55)

git-committer:

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

Message:

Always add copyright information to the image and also add release script

Files:

• Makefile (modified) (3 diffs)
• meson/part/initrd/meson.build (modified) (1 diff)
• meson/part/tools/meson.build (modified) (1 diff)
• release/Makefile (deleted)
• tools/build_all.sh (modified) (1 diff)
• tools/list_profiles.sh (added)
• tools/release.sh (added)

Makefile

@@ -34 +34 @@
 ERRNO_INPUT = abi/include/abi/errno.in
 
-.PHONY: all cscope cscope_parts format ccheck ccheck-fix space doxy check_errno releasefile release
+.PHONY: nothing cscope cscope_parts format ccheck ccheck-fix space check_errno
 
-all:
+nothing:
 
 cscope:
@@ -61 +61 @@
         tools/srepl '[ \t]\+$$' ''
 
-doxy: $(BUILD_DIR)/build.ninja
-        ninja -C $(BUILD_DIR) doxygen
-
 # `sed` pulls a list of "compatibility-only" error codes from `errno.in`,
 # the following grep finds instances of those error codes in HelenOS code.
@@ -71 +68 @@
         git grep -n -f - -- ':(exclude)abi' ':(exclude)uspace/lib/posix'
 
-# Release files
-
-releasefile: all
-        $(MAKE) -r -C release releasefile
-
-release:
-        $(MAKE) -r -C release release
-
 $(ERRNO_HEADER): $(ERRNO_INPUT)
         echo '/* Generated file. Edit errno.in instead. */' > $@.new

meson/part/initrd/meson.build

@@ -11 +11 @@
         install_deps += [ files(libgcc) ]
 endif
+
+# Collect and install copyright information.
+copyrights_file = custom_target('COPYRIGHT',
+        output: 'COPYRIGHT',
+        command: cpc,
+        capture: true,
+)
+
+install_files += [[ '', copyrights_file.full_path(), 'COPYRIGHT' ]]
+install_deps += [ copyrights_file ]
 
 # Emit the install script.

meson/part/tools/meson.build

@@ -25 +25 @@
 unzip = find_program('unzip')
 which = find_program('which')
+cpc = find_program(_tools_dir / 'cc.sh')
 
 sh = [ find_program('sh'), '-u', '-e' ]

tools/build_all.sh

@@ -32 +32 @@
 
 CONFIG_RULES="${SOURCE_DIR}/HelenOS.config"
-CONFIG_DEFAULTS="${SOURCE_DIR}/defaults"
 
-# Find all the leaf subdirectories in the defaults directory.
-PROFILES=`find ${CONFIG_DEFAULTS} -type d -links 2 -printf "%P\n" | sort`
-
+PROFILES=`sh ${SOURCE_DIR}/tools/list_profiles.sh`
 
 echo