]> rtime.felk.cvut.cz Git - omk.git/commitdiff
Merge branch 'master' into devel devel
authorMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 19 Feb 2009 08:25:56 +0000 (09:25 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 19 Feb 2009 08:25:56 +0000 (09:25 +0100)
Conflicts:
snippets/include.omk
snippets/qt.omk

doc/index.html
omk [new file with mode: 0755]
snippets/rtems.omk
snippets/sdcc.omk
snippets/sysless.omk
snippets/vxworks.omk
tests/qt/Makefile3.omk [new file with mode: 0644]
tests/qt/qtapp/Makefile [new file with mode: 0644]
tests/qt/qtapp/Makefile.omk [new file with mode: 0644]
tests/qt/runtest
tests/qt/somelib/Makefile.omk

index 24476713d3bf79c3ce2b77ac2d84b7dc5576bb52..625c35c7e78f223aa7c8484cf03754f10e501dbd 100644 (file)
@@ -4,7 +4,14 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-2">
 <title>OMK Make-System Homepage</title>
 </head>
-
+<style>
+.news td {
+      vertical-align: top;
+      padding-right: 0.5em;
+      padding-bottom: 0.5em;
+}
+
+</style>
 <body>
 <h1>OMK Make-System Homepage</h1>
 
@@ -26,10 +33,20 @@ may do incompatible changes in future.
 
 <h2>News</h2>
 
-<ul>
-  <li>2008-30-10: OMK repository has been migrated from Darcs to GIT (see bellow).</li>
-  <li>2008-04-23: OMK version 0.1 released.</li>
-</ul>
+<table class="news">
+  <tr><td>2009-02-03</td> <td>We work on rewrite of OMK. The rewritten
+  version should be faster, easier to maintain and should recompile
+  files if compile command line changes. You can watch the development
+  in <a href="http://rtime.felk.cvut.cz/gitweb/omk.git?a=shortlog;h=refs/heads/devel">devel
+    branch</a> of OMK repository.  In short time we release OMK 0.2
+    which will contain bug fixes and small enhancements to OMK
+    0.1. Then OMK 0.3 will be the rewritten version.</td></tr>
+  
+  <tr><td>2008-10-30</td><td>OMK repository has been migrated from
+  Darcs to GIT (see bellow).</td></tr>
+
+  <tr><td>2008-04-23</td><td>OMK version 0.1 released.</td></tr>
+</table>
 
 <h2>Download</h2>
 
diff --git a/omk b/omk
new file mode 100755 (executable)
index 0000000..89e66cb
--- /dev/null
+++ b/omk
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Helper script to run OMK from directories without the leaf OMK Makefile
+
+omk_rules=$(
+old_pwd=""
+while [ ! -e Makefile.rules ]; do
+       if [ "$old_pwd" = `pwd`  ]; then 
+              echo "Makefile.rules has not been found in this or parent directory" >&2; exit 1; 
+       else
+              old_pwd=`pwd`; 
+              cd -L .. 2>/dev/null; 
+       fi; 
+done; 
+echo `pwd`/Makefile.rules
+)
+
+[ "$omk_rules" ] && make -f $omk_rules "$@"
index 59ed5074254ef1a7f658a4ce7db315e49623d00a..ad5d47f4a6c069bc84268a569fc884c690320df1 100644 (file)
@@ -297,7 +297,7 @@ $(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLAT
 
 $(eval $(call omk_pass_template,clean,$(USER_OBJS_DIR),,always))
 
-check-dir:
+check-dir::
        @$(call mkdir_def,$(USER_INCLUDE_DIR))
        @$(call mkdir_def,$(USER_LIB_DIR))
        @$(call mkdir_def,$(USER_BIN_DIR))
index 50d7c698bad5bafc50171d7aca54ab101bdd0d88..86247a7d3aff570d091fba8664ab8d8bc05df6fb 100644 (file)
@@ -358,7 +358,7 @@ clean-local: clean-custom
            if [ -e $(confh) ] ; then touch -t 200001010101 $(confh) ; fi ; \
        )
 
-check-dir:
+check-dir::
        @$(call mkdir_def,$(USER_OBJS_DIR))
        @$(call mkdir_def,$(USER_INCLUDE_DIR))
        @$(call mkdir_def,$(USER_LIB_DIR))
index 349686165256b059f29f8784c372829b8fa86cd8..288205ffe51b2ef0e3289ed42d816684c4ea67b0 100644 (file)
@@ -266,7 +266,7 @@ clean-local: clean-custom
               $(USER_OBJS_DIR)/*.map \
               $(LOCAL_CONFIG_H:%=$(USER_OBJS_DIR)/%)
 
-check-dir:
+check-dir::
        @$(call mkdir_def,$(USER_INCLUDE_DIR))
        @$(call mkdir_def,$(USER_LIB_DIR))
        @$(call mkdir_def,$(USER_BIN_DIR))
index f5a9c7d00dbe0d90f844035df5b74573c94deda3..6b4bbbfb24cb3e41555d906527c592198f5c0a2b 100644 (file)
@@ -198,7 +198,7 @@ clean-local:
 $(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES)))
 $(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS)$(utils_PROGRAMS)$(test_PROGRAMS)))
 
-check-dir:
+check-dir::
        @$(call mkdir_def,$(USER_BUILD_DIR))
        @$(call mkdir_def,$(USER_INCLUDE_DIR))
        @$(call mkdir_def,$(USER_LIB_DIR))
diff --git a/tests/qt/Makefile3.omk b/tests/qt/Makefile3.omk
new file mode 100644 (file)
index 0000000..37f2e60
--- /dev/null
@@ -0,0 +1 @@
+SUBDIRS = somelib qtapp
diff --git a/tests/qt/qtapp/Makefile b/tests/qt/qtapp/Makefile
new file mode 100644 (file)
index 0000000..08cf5ff
--- /dev/null
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else   
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+
diff --git a/tests/qt/qtapp/Makefile.omk b/tests/qt/qtapp/Makefile.omk
new file mode 100644 (file)
index 0000000..38283a1
--- /dev/null
@@ -0,0 +1 @@
+QT_PROJECTS=qtapp.pro
index 45435374c5f571ac47a632dcad745191c19fbf4c..96bf360b94951257530e71af09d2a1ec7c545644 100755 (executable)
@@ -9,10 +9,18 @@ export QTDIR
 
 cp Makefile1.omk Makefile.omk
 make || error "QT compilation"
-[ -x qtapp/qtapp ] || error "QT application was not compiled"
+[ -x _compiled/bin/qtapp ] || error "QT application was not compiled"
 
-make distclean || error "QT distclean"
+make clean || error "QT clean 1"
 
 cp Makefile2.omk Makefile.omk
 make || error "QT Compilation in subdir"
-[ -x qtapp/qtapp ] || error "QT application was not compiled"
+[ -x _compiled/bin/qtapp ] || error "QT application was not compiled"
+
+make clean || error "QT clean 2"
+
+cp Makefile3.omk Makefile.omk
+make || error "QT_PROJECT test "
+[ -x _compiled/bin/qtapp ] || error "QT application was not compiled"
+
+make clean || error "QT clean 3"
index 0726c154b6c775a90e15608f04ba270204128f9b..3d26c8901661783f19625b44b9837c96124f097f 100644 (file)
@@ -1,4 +1,5 @@
 include_HEADERS = header.h
-lib_LIBRARIES = somelib
+shared_LIBRARIES = somelib
+
 
 somelib_SOURCES = somelib.c