Changeset 80 for HelloMruby/trunk

Timestamp:

Jun 21, 2014, 9:51:36 AM (10 years ago)

Author:

okuma-top

Message:

change VM composite name

Location:

HelloMruby/trunk

Files:

• HelloMruby.cdl (modified) (1 diff)
• Makefile (modified) (1 diff)
• MyMrubyVM.cdl (modified) (1 diff)

HelloMruby/trunk/HelloMruby.cdl

@@ -80 +80 @@
 };
 
-cell tPosixMrubyVM MrubyVMTask{
+cell tPosixMrubyVmInTask MrubyVMTask{
         cInit = VM_TECSInitializer.eInitialize;
 

HelloMruby/trunk/Makefile

@@ -13 +13 @@
 
 # 変数 #_MVAR_#
-# fixed variable (unchangeable by config or plugin)
-TARGET_BASE = HelloMruby
+TARGET = HelloMruby.exe
+TIMESTAMP = tecsgen.timestamp
+TECSGEN_EXE = tecsgen
 BASE_DIR = .
+CC = gcc
+CFLAGS = -I $(BASE_DIR)/. -I $(TECSPATH)/../test/cygwin -I $(TECSPATH) -I $(TECSPATH)/mruby -I $(TECSPATH)/posix -I $(TECSPATH)/rpc -I $(MRUBYPATH)/include -I $(GEN_DIR) -D "Inline=static inline"
+LD = gcc
+LDFLAGS = -lmruby -L$(MRUBYPATH)/lib -lm
 GEN_DIR = $(BASE_DIR)/gen
-INCLUDES = -I $(BASE_DIR)/. -I $(TECSPATH)/../test/cygwin -I $(TECSPATH) -I $(TECSPATH)/mruby -I $(TECSPATH)/posix -I $(TECSPATH)/rpc -I $(MRUBYPATH)/include -I $(GEN_DIR)
-DEFINES =
-
-# end of fixed variable (unchangeable by config or plugin)
-#default C Compiler
-CC = gcc
-
-#default C Compiler options
-CFLAGS = $(INCLUDES) $(DEFINES) -D  "Inline=static inline"
-
-#default Liknker
-LD = gcc
-
-#default Liknker Options
-LDFLAGS = -lmruby -L ../lib
-
-#CHANGE this into suitable path
-MRUBYPATH = ..
-
-#default srource directory
 SRC_DIR = $(BASE_DIR)/src
-
-#default target name
-TARGET = $(TARGET_BASE).exe
-
-#default TECS generator
-TECSGEN_EXE = tecsgen
-# uncomment below if you don't have Ruby. work on only Windows 
-# TECSGEN_EXE = tecsgen.exe
-
-#Time Stamp
-TIMESTAMP = tecsgen.timestamp
-
-#default relocatable object (.o) directory
 _TECS_OBJ_DIR = $(GEN_DIR)/
-
-
-
-# Pre-tecsgen target
+#   _TECS_OBJ_DIR   # should end with '/'
 PRE_TECSGEN_TARGET =
-
-# Post-tecsgen target
 POST_TECSGEN_TARGET =
 
-# vpath for C sources and headers
 vpath %.c $(SRC_DIR) $(GEN_DIR)  $(TECSPATH)/../test/cygwin $(TECSPATH) $(TECSPATH)/mruby $(TECSPATH)/posix $(TECSPATH)/rpc $(MRUBYPATH)/include
 vpath %.h $(SRC_DIR) $(GEN_DIR)  $(TECSPATH)/../test/cygwin $(TECSPATH) $(TECSPATH)/mruby $(TECSPATH)/posix $(TECSPATH)/rpc $(MRUBYPATH)/include
 
-# Other objects (out of tecsgen)
 OTHER_OBJS =                      # Add objects out of tecs care.
 # OTHER_OBJS = $(_TECS_OBJ_DIR)vasyslog.o
+
+# Additional VARS
+# CHANGE this into suitable path
+MRUBYPATH = ..
+
 # ルール #_MRUL_#
 allall: tecs

HelloMruby/trunk/MyMrubyVM.cdl

@@ -14 +14 @@
 
 [active]
-composite tPosixMrubyVM {
+composite tPosixMrubyVmInTask {
         [optional]
                 call nMruby::sInitializeBridge cInit;