Pārlūkot izejas kodu

Libraries: Fix wrong paths to "Root" in the various install.sh scripts.

We were installing libraries into /Libraries/Root, rather than in /Root.
This made the ports system behave rather unpredictable, since I had old
versions of things in /Root and new versions of things in /Libraries/Root.
Andreas Kling 6 gadi atpakaļ
vecāks
revīzija
0ef13e60b0

+ 15 - 12
Libraries/LibC/install.sh

@@ -1,14 +1,17 @@
 #!/bin/bash
 
-mkdir -p ../Root/usr/include/sys/
-mkdir -p ../Root/usr/include/netinet/
-mkdir -p ../Root/usr/include/arpa/
-mkdir -p ../Root/usr/lib/
-cp *.h ../Root/usr/include/
-cp sys/*.h ../Root/usr/include/sys/
-cp arpa/*.h ../Root/usr/include/arpa/
-cp netinet/*.h ../Root/usr/include/netinet/
-cp libc.a ../Root/usr/lib/
-cp crt0.o ../Root/usr/lib/
-cp crti.ao ../Root/usr/lib/crti.o
-cp crtn.ao ../Root/usr/lib/crtn.o
+set -e
+SERENITY_ROOT=../../
+
+mkdir -p $SERENITY_ROOT/Root/usr/include/sys/
+mkdir -p $SERENITY_ROOT/Root/usr/include/netinet/
+mkdir -p $SERENITY_ROOT/Root/usr/include/arpa/
+mkdir -p $SERENITY_ROOT/Root/usr/lib/
+cp *.h $SERENITY_ROOT/Root/usr/include/
+cp sys/*.h $SERENITY_ROOT/Root/usr/include/sys/
+cp arpa/*.h $SERENITY_ROOT/Root/usr/include/arpa/
+cp netinet/*.h $SERENITY_ROOT/Root/usr/include/netinet/
+cp libc.a $SERENITY_ROOT/Root/usr/lib/
+cp crt0.o $SERENITY_ROOT/Root/usr/lib/
+cp crti.ao $SERENITY_ROOT/Root/usr/lib/crti.o
+cp crtn.ao $SERENITY_ROOT/Root/usr/lib/crtn.o

+ 6 - 3
Libraries/LibCore/install.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 
-mkdir -p ../Root/usr/include/LibCore/
-cp *.h ../Root/usr/include/LibCore/
-cp libcore.a ../Root/usr/lib/
+set -e
+SERENITY_ROOT=../../
+
+mkdir -p $SERENITY_ROOT/Root/usr/include/LibCore/
+cp *.h $SERENITY_ROOT/Root/usr/include/LibCore/
+cp libcore.a $SERENITY_ROOT/Root/usr/lib/

+ 5 - 2
Libraries/LibDraw/install.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
 
-mkdir -p ../Root/usr/include/LibGfx/
-cp *.h ../Root/usr/include/LibGfx/
+set -e
+SERENITY_ROOT=../../
+
+mkdir -p $SERENITY_ROOT/Root/usr/include/LibGfx/
+cp *.h $SERENITY_ROOT/Root/usr/include/LibGfx/

+ 6 - 3
Libraries/LibGUI/install.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
-mkdir -p ../Root/usr/include/LibGUI/
-cp *.h ../Root/usr/include/LibGUI/
-cp libgui.a ../Root/usr/lib/
+set -e
+SERENITY_ROOT=../../
+
+mkdir -p $SERENITY_ROOT/Root/usr/include/LibGUI/
+cp *.h $SERENITY_ROOT/Root/usr/include/LibGUI/
+cp libgui.a $SERENITY_ROOT/Root/usr/lib/

+ 7 - 4
Libraries/LibM/install.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-mkdir -p ../Root/usr/include/sys/
-mkdir -p ../Root/usr/lib/
-cp *.h ../Root/usr/include/
-cp libm.a ../Root/usr/lib/
+set -e
+SERENITY_ROOT=../../
+
+mkdir -p $SERENITY_ROOT/Root/usr/include/sys/
+mkdir -p $SERENITY_ROOT/Root/usr/lib/
+cp *.h $SERENITY_ROOT/Root/usr/include/
+cp libm.a $SERENITY_ROOT/Root/usr/lib/