fixes Dockerfile and hello.cc

anthongretter · Oct 3, 2024 · 06695d1 · 06695d1
1 parent 39c5dbe
commit 06695d1
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 120 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,8 @@ FROM fedora:40
 ENV APP=hello
 
 RUN yum -y update &&  \
-    yum -y install make qemu binutils binutils-x86_64-linux-gnu nano dev86 && \
+    yum -y install make g++ gcc gdb qemu binutils binutils-x86_64-linux-gnu cross-gcc-common \
+                    gcc-c++-x86_64-linux-gnu nano dev86 && \
     yum clean all
 
 WORKDIR /app

diff --git a/app/hello/hello.cc b/app/hello/hello.cc
@@ -8,8 +8,7 @@ OStream cout;
 
 int main()
 {
-    int tasks[3];
-
+    cout << "Hello\n" << endl;
 
     return 0;
 }
diff --git a/app/hello/hello_traits.h b/app/hello/hello_traits.h
@@ -30,8 +30,8 @@ template<> struct Traits<Debug>: public Traits<Build>
 {
     static const bool error   = true;
     static const bool warning = true;
-    static const bool info    = true;
-    static const bool trace   = true;
+    static const bool info    = false;
+    static const bool trace   = false;
 };
 
 template<> struct Traits<Lists>: public Traits<Build>

diff --git a/etc/epos.cfg b/etc/epos.cfg
diff --git a/etc/eposcc.cfg b/etc/eposcc.cfg
diff --git a/include/system/config.h b/include/system/config.h
@@ -7,17 +7,17 @@
 // ARCHITECTURE, MACHINE, AND APPLICATION SELECTION
 // This section is generated automatically from makedefs by $EPOS/etc/makefile
 //============================================================================
-#define SMOD library
-#define ARCH ia32
-#define MACH pc
-#define MMOD legacy_pc
-#define NETW standalone
-#define APPL hello
-#define __library__
-#define __ia32__
-#define __pc__
-#define __legacy_pc__
-#define __standalone__
+#define SMOD xxx
+#define ARCH xxx
+#define MACH xxx
+#define MMOD xxx
+#define NETW xxx
+#define APPL xxx
+#define __mode_xxx__
+#define __arch_xxx__
+#define __mach_xxx__
+#define __mmod_xxx__
+#define __netw_xxx__
 
 //============================================================================
 // NAMESPACES AND DEFINITIONS

diff --git a/tools/eposcc/eposcc.cfg b/tools/eposcc/eposcc.cfg
diff --git a/tools/eposcfg/eposcfg b/tools/eposcfg/eposcfg
diff --git a/tools/eposcfg/eposcfg.o b/tools/eposcfg/eposcfg.o
diff --git a/tools/eposmkbi/eposmkbi b/tools/eposmkbi/eposmkbi
diff --git a/tools/eposmkbi/eposmkbi.o b/tools/eposmkbi/eposmkbi.o