diff options
| -rwxr-xr-x | project/clbuild.sh | 148 | ||||
| -rw-r--r-- | project/extras.mk | 5 | ||||
| -rw-r--r-- | sysinfo/os/pe.mk | 5 |
3 files changed, 156 insertions, 2 deletions
diff --git a/project/clbuild.sh b/project/clbuild.sh new file mode 100755 index 0000000..f69745e --- /dev/null +++ b/project/clbuild.sh @@ -0,0 +1,148 @@ +#!/bin/sh +# a poor man's universal driver (but stay tuned...) + +error_msg() +{ + echo $@ >&2 +} + +mb_source_dir= +mb_project_dir= + +# one: args +for arg ; do + case "$arg" in + --help) usage + ;; + --source-dir=*) + mb_source_dir=${arg#*=} + ;; + --project-dir=*) + mb_project_dir=${arg#*=} + ;; + *) + error_msg ${arg#}: "unsupported config argument." + exit 2 + ;; + esac +done + +if [ -z "$mb_source_dir" ] || [ -z "$mb_project_dir" ]; then + usage +fi + +# two: clean +make -s clean || exit 1 + +# three: init +echo '@echo on' +echo '@dir . > nul' +echo +echo +echo 'REM override variables either here or from the shell' +echo 'set source_dir=%source_dir%' +echo 'set sysroot=%sysroot%' +echo +echo + +# four: build tree +cmd_abort_on_error='@if %errorlevel% neq 0 exit /b %errorlevel%' +sysroot_include_arg='-I%sysroot%/include' + +dirs=`make dirs.tag tree.tag \ + | grep -v 'make\[1\]:' \ + | grep -v 'touch dirs.tag' \ + | grep -v 'touch tree.tag' \ + | sed \ + -e 's/mkdir -p//g' \ + -e 's@/@\\\\@g'` + +for d in $dirs; do + printf 'if not exist %-20smkdir %s\n' "$d" "$d" +done + +echo +echo "$cmd_abort_on_error" +echo + +# five: build objects +make shared-objs static-objs app-objs \ + | grep -v 'make\[1\]:' \ + | grep -v "$mb_project_dir/sysinfo/host" \ + | grep -v 'touch dirs.tag' \ + | grep -v 'touch host.tag' \ + | grep -v 'touch version.tag' \ + | grep -v 'touch app.tag' \ + | sed \ + -e 's@cc @cl /nologo @' \ + -e 's@ '"$mb_source_dir"'@ %source_dir%@' \ + -e 's@-I'"$mb_source_dir"'@-I%source_dir%@g' \ + -e 's@-ffreestanding@/X@g' \ + -e 's@-o @/Fo:@g' \ + -e 's@-std=c99 @@g' \ + -e 's@-fPIC@@g' \ + -e 's@-fpic@@g' \ + -e 's@-g @/Zi @g' \ + -e 's@-g0 @/Zi @g' \ + -e 's@-g1 @/Zi @g' \ + -e 's@-g2 @/Zi @g' \ + -e 's@-g3 @/Zi @g' \ + -e 's@-O @/O2 @g' \ + -e 's@-Os @/O1 @g' \ + -e 's@-O0 @/Od @g' \ + -e 's@-O1 @/O2 @g' \ + -e 's@-O2 @/O2 @g' \ + -e 's@-O3 @/O2 @g' \ + -e 's@-Wall @/Wall @g' \ + -e 's@-Werror @/WX @g' \ + -e 's@-Wextra @@g' \ + -e 's@-Wundef @/Wall @g' \ + -e 's,$, -I%sysroot%/include\n\n'"$cmd_abort_on_error"'\n,g' + +echo +echo '@echo.' +echo '@echo clbuild: successfully built: shared-objs static-objs app-objs.' +echo '@echo.' +echo + +# six: create static archive +make static \ + | grep -v 'make\[1\]:' \ + | grep -v "rm -f " \ + | sed \ + -e 's@ar rcs @lib /out:@' \ + -e 's,$, /nologo\n,g' + +echo +echo '@echo.' +echo '@echo clbuild: successfully created: static archive.' +echo '@echo.' +echo + +# seven: link shared library +make LDFLAGS_IMPLIB= LDFLAGS_SONAME= shared-lib \ + | grep -v 'make\[1\]:' \ + | sed \ + -e 's@cc -shared @link /dll /nologo @' \ + -e 's@-o @/out:@g' \ + -e 's@ -L@/libpath:@g' \ + -e 's@-nostdlib @/nodefaultlib @g' \ + -e 's@-Wl,--subsystem=@/subsystem:@g' \ + -e 's@-Wl,--entry -Wl,@/entry:@g' \ + -e 's@-Wl,--no-undefined@@g' \ + -e 's@-Wl,--exclude-all-symbols@@g' \ + +echo +echo '@echo.' +echo '@echo clbuild: successfully linked: shared library.' +echo '@echo.' +echo + +echo +echo '@echo.' +echo '@echo yay.' +echo '@echo.' +echo + +# all done +exit 0 diff --git a/project/extras.mk b/project/extras.mk index f9ddb03..f208e19 100644 --- a/project/extras.mk +++ b/project/extras.mk @@ -24,3 +24,8 @@ install-headers-custom: install-headers-default cp $(API_HEADERS_NT64) \ $(DESTDIR)$(INCLUDEDIR)/$(PACKAGE)/bits/nt64 + +clbuild-bat: + @$(PROJECT_DIR)/project/clbuild.sh \ + --source-dir=$(SOURCE_DIR) \ + --project-dir=$(PROJECT_DIR) diff --git a/sysinfo/os/pe.mk b/sysinfo/os/pe.mk index 26358e6..bbb74b2 100644 --- a/sysinfo/os/pe.mk +++ b/sysinfo/os/pe.mk @@ -2,8 +2,9 @@ LDFLAGS_IMPLIB += -Wl,--output-def LDFLAGS_IMPLIB += -Wl,$(IMPLIB_DEF) LDFLAGS_SHARED += $(LDFLAGS_IMPLIB) -LDFLAGS_SHARED += -Wl,-soname -LDFLAGS_SHARED += -Wl,$(DSO_SONAME) +LDFLAGS_SONAME += -Wl,-soname +LDFLAGS_SONAME += -Wl,$(DSO_SONAME) +LDFLAGS_SHARED += $(LDFLAGS_SONAME) PE_SUBSYSTEM ?= windows LDFLAGS_COMMON += -Wl,--subsystem=$(PE_SUBSYSTEM) |