Changeset b501de7 in mainline

Timestamp:

2018-11-26T13:55:51Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1b555f0f

Parents:

5aa06ad

git-author:

Jiri Svoboda <jiri@…> (2018-11-25 17:54:21)

git-committer:

Jiri Svoboda <jiri@…> (2018-11-26 13:55:51)

Message:

XCW should rely on export dir instead of touching the source tree. Allow specifying alternate export dir. Add more exported libraries (yes, I know).

Files:

• tools/xcw/bin/helenos-bld-config (modified) (1 diff)
• tools/xcw/bin/helenos-cc (modified) (2 diffs)
• tools/xcw/bin/helenos-ld (modified) (2 diffs)
• tools/xcw/bin/helenos-pkg-config (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/lib/posix/Makefile (modified) (4 diffs)

tools/xcw/bin/helenos-bld-config

@@ -33 +33 @@
 
 SRC_ROOT="$(dirname "$0")/../../.."
-MAKEFILE_COMMON="$SRC_ROOT"/Makefile.common
-MAKEFILE_CONFIG="$SRC_ROOT"/Makefile.config
-CONFIG_MK="$SRC_ROOT"/uspace/export/config.mk
+if [ -z "$EXPORT_DIR" ]; then
+        EXPORT_DIR="$SRC_ROOT/uspace/export"
+fi
+MAKEFILE_COMMON="$EXPORT_DIR"/Makefile.common
+MAKEFILE_CONFIG="$EXPORT_DIR"/Makefile.config
+CONFIG_MK="$EXPORT_DIR"/config.mk
 
 # Extract simple 'name = value' variable definition from Makefile

tools/xcw/bin/helenos-cc

@@ -34 +34 @@
 XCW="$(dirname "$0")"
 SRC_ROOT="$XCW/../../.."
+if [ -z "$EXPORT_DIR" ]; then
+        EXPORT_DIR="$SRC_ROOT/uspace/export"
+fi
 UARCH="$("$XCW"/helenos-bld-config --uarch)"
 CC="$("$XCW"/helenos-bld-config --cc)"
@@ -49 +52 @@
     "$@" \
     -I"$XCW"/../include \
-    -I"$SRC_ROOT"/uspace/lib/c/include \
-    -I"$SRC_ROOT"/abi/include \
-    -I"$SRC_ROOT"/uspace/lib/c/arch/"$UARCH"/include
+    -I"$EXPORT_DIR"/include/libc \
+    -I"$EXPORT_DIR"/include

tools/xcw/bin/helenos-ld

@@ -34 +34 @@
 XCW="$(dirname "$0")"
 SRC_ROOT="$XCW/../../.."
+if [ -z "$EXPORT_DIR" ]; then
+        EXPORT_DIR="$SRC_ROOT/uspace/export"
+fi
 UARCH="$("$XCW"/helenos-bld-config --uarch)"
 CFLAGS="$("$XCW"/helenos-bld-config --cflags)"
@@ -43 +46 @@
     $CFLAGS \
     "$@" \
-    "$SRC_ROOT"/uspace/lib/c/crt0.o \
-    "$SRC_ROOT"/uspace/lib/c/crt1.o \
-    "$SRC_ROOT"/uspace/lib/c/libc.a \
+    "$EXPORT_DIR"/lib/crt0.o \
+    "$EXPORT_DIR"/lib/crt1.o \
+    "$EXPORT_DIR"/lib/libc.a \
     -lgcc

tools/xcw/bin/helenos-pkg-config

@@ -35 +35 @@
 SRC_ROOT="$XCW/../../.."
 UARCH="$("$XCW"/helenos-bld-config --uarch)"
+if [ -z "$EXPORT_DIR" ]; then
+        EXPORT_DIR="$SRC_ROOT/uspace/export"
+fi
+INCLUDE_DIR="$EXPORT_DIR/include"
+LIB_DIR="$EXPORT_DIR/lib"
 
-libmath_cflags="-I$SRC_ROOT/uspace/lib/math/include\
-    -I$SRC_ROOT/uspace/lib/math/arch/$UARCH/include"
-libmath_libs="$SRC_ROOT/uspace/lib/math/libmath.a"
+libmath_cflags="-I$INCLUDE_DIR/libmath"
+libmath_libs="$LIB_DIR/libmath.a"
 
-libgui_cflags="-I$SRC_ROOT/uspace/lib/gui"
-libgui_libs="$SRC_ROOT/uspace/lib/gui/libgui.a"
+libgui_cflags="-I$INCLUDE_DIR/libgui"
+libgui_libs="$LIB_DIR/libgui.a"
 
-libdraw_cflags="-I$SRC_ROOT/uspace/lib/draw"
-libdraw_libs="$SRC_ROOT/uspace/lib/draw/libdraw.a \
-    $SRC_ROOT/uspace/lib/softrend/libsoftrend.a"
+libdraw_cflags="-I$INCLUDE_DIR/libdraw"
+libdraw_libs="$LIB_DIR/libdraw.a $LIB_DIR/libsoftrend.a"
 
-libhound_cflags="-I$SRC_ROOT/uspace/lib/hound/include"
-libhound_libs="$SRC_ROOT/uspace/lib/hound/libhound.a"
+libhound_cflags="-I$INCLUDE_DIR/libhound"
+libhound_libs="$LIB_DIR/libhound.a"
 
-libpcm_cflags="-I$SRC_ROOT/uspace/lib/pcm/include"
-libpcm_libs="$SRC_ROOT/uspace/lib/pcm/libpcm.a"
+libpcm_cflags="-I$INCLUDE_DIR/libpcm"
+libpcm_libs="$LIB_DIR/libpcm.a"
 
 action=none

uspace/Makefile

@@ -273 +273 @@
         $(MAKE) -r -C $(basename $@) all-test PRECHECK=$(PRECHECK)
 
-export: lib/posix.build lib/math.build lib/clui.build
+export: $(BUILDS)
         $(MAKE) -r -C lib/posix export EXPORT_DIR=$(EXPORT_DIR)
 

uspace/lib/posix/Makefile

@@ -36 +36 @@
         ../math/libmath.a \
         ../clui/libclui.a \
+        ../gui/libgui.a \
+        ../draw/libdraw.a \
+        ../softrend/libsoftrend.a \
+        ../hound/libhound.a \
+        ../pcm/libpcm.a \
         $(LIBC_PREFIX)/libc.a \
         $(LIBC_PREFIX)/crt0.o \
@@ -93 +98 @@
 include $(USPACE_PREFIX)/Makefile.common
 
-export: $(EXPORT_DIR)/config.mk $(EXPORT_DIR)/config.rc
+export: $(EXPORT_DIR)/config.mk $(EXPORT_DIR)/config.rc \
+    $(EXPORT_DIR)/Makefile.common $(EXPORT_DIR)/Makefile.config
 
 $(EXPORT_DIR)/config.mk: export-libs export-includes
@@ -111 +117 @@
         sed 's:$$(HELENOS_EXPORT_ROOT):$$HELENOS_EXPORT_ROOT:g' < $< >$@
 
+$(EXPORT_DIR)/Makefile.common: ../../../Makefile.common
+        cp $< $@
+
+$(EXPORT_DIR)/Makefile.config: ../../../Makefile.config
+        cp $< $@
+
 export-libs: $(EXPORT_FILES) export-includes
         mkdir -p $(EXPORT_DIR)/lib
@@ -124 +136 @@
         cp -L ../clui/tinput.h $(EXPORT_DIR)/include.new/libclui
         rm -rf $(EXPORT_DIR)/include
+        mkdir -p $(EXPORT_DIR)/include.new/libdraw
+        cp -r -L -t $(EXPORT_DIR)/include.new/libdraw ../draw/*.h
+        mkdir -p $(EXPORT_DIR)/include.new/libdraw/codec
+        cp -r -L -t $(EXPORT_DIR)/include.new/libdraw/codec ../draw/codec/*.h
+        mkdir -p $(EXPORT_DIR)/include.new/libgui
+        cp -L -t $(EXPORT_DIR)/include.new/libgui ../gui/*.h
+        mkdir -p $(EXPORT_DIR)/include.new/libhound
+        cp -r -L -t $(EXPORT_DIR)/include.new/libhound ../hound/include/*
+        mkdir -p $(EXPORT_DIR)/include.new/libpcm
+        cp -r -L -t $(EXPORT_DIR)/include.new/libpcm ../pcm/include/*
         mv $(EXPORT_DIR)/include.new $(EXPORT_DIR)/include