소스 검색

remove examples depend.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1087 bbd45198-f89e-11dd-88c7-29a3b14d5316
bernard.xiong 14 년 전
부모
커밋
f01f25b451
4개의 변경된 파일41개의 추가작업 그리고 41개의 파일을 삭제
  1. 1 1
      examples/gui/SConscript
  2. 38 38
      examples/gui/demo_view.c
  3. 1 1
      examples/kernel/SConscript
  4. 1 1
      examples/libc/SConscript

+ 1 - 1
examples/gui/SConscript

@@ -31,6 +31,6 @@ gui_init.c
 mywidget.c
 """)
 
-group = DefineGroup('gui_examples', src, depend = ['RTGUI_USING_EXAMPLES'])
+group = DefineGroup('gui_examples', src, depend = ['RT_USING_RTGUI'])
 
 Return('group')

+ 38 - 38
examples/gui/demo_view.c

@@ -4,14 +4,14 @@
 #include <rtgui/widgets/workbench.h>
 #include <rtgui/widgets/staticline.h>
 
-/* 鐢ㄤ簬瀛樻斁婕旂ず瑙嗗浘鐨勬暟缁勶紝鏈€澶氬彲鍒涘缓32涓�紨绀鸿�鍥� */
+/* 用于存放演示视图的数组,最多可创建32个演示视图 */
 static rtgui_view_t* demo_view_list[32];
-/* 褰撳墠婕旂ず瑙嗗浘绱㈠紩 */
+/* 当前演示视图索引 */
 static rt_uint16_t demo_view_current = 0;
-/* 鎬诲叡鍖呮嫭鐨勬紨绀鸿�鍥炬暟鐩� */
+/* 总共包括的演示视图数目 */
 static rt_uint16_t demo_view_number = 0;
 
-/* 鏄剧ず涓嬩竴涓�紨绀鸿�鍥� */
+/* 显示下一个演示视图 */
 void demo_view_next(struct rtgui_widget* widget, rtgui_event_t *event)
 {
 	if (demo_view_current + 1< demo_view_number)
@@ -21,7 +21,7 @@ void demo_view_next(struct rtgui_widget* widget, rtgui_event_t *event)
 	}
 }
 
-/* 鏄剧ず鍓嶄竴涓�紨绀鸿�鍥� */
+/* 显示前一个演示视图 */
 void demo_view_prev(struct rtgui_widget* widget, rtgui_event_t *event)
 {
 	if (demo_view_current != 0)
@@ -31,30 +31,30 @@ void demo_view_prev(struct rtgui_widget* widget, rtgui_event_t *event)
 	}
 }
 
-/* 鍒涘缓涓€涓�紨绀鸿�鍥撅紝闇€鎻愪緵鐖秝orkbench鍜屾紨绀虹敤鐨勬爣棰� */
+/* 创建一个演示视图,需提供父workbench和演示用的标题 */
 rtgui_view_t* demo_view(rtgui_workbench_t* workbench, const char* title)
 {
 	struct rtgui_view* view;
 
-	/* 璁剧疆瑙嗗浘鐨勫悕绉� */
+	/* 设置视图的名称 */
 	view = rtgui_view_create(title);
 	if (view == RT_NULL) return RT_NULL;
 
-	/* 鍒涘缓鎴愬姛鍚庯紝娣诲姞鍒版暟缁勪腑 */
+	/* 创建成功后,添加到数组中 */
 	demo_view_list[demo_view_number] = view;
 	demo_view_number ++;
 
-	/* 娣诲姞鍒扮埗workbench涓� */
+	/* 添加到父workbench中 */
 	rtgui_workbench_add_view(workbench, view);
 
-	/* 娣诲姞涓嬩竴涓��鍥惧拰鍓嶄竴涓��鍥炬寜閽� */
+	/* 添加下一个视图和前一个视图按钮 */
 	{
 		struct rtgui_rect rect;
 		struct rtgui_button *next_btn, *prev_btn;
 		struct rtgui_label *label;
 		struct rtgui_staticline *line;
 
-		/* 鑾峰緱瑙嗗浘鐨勪綅缃�俊鎭�(鍦ㄥ姞鍏ュ埌workbench涓�椂锛寃orkbench浼氳嚜鍔ㄨ皟鏁磋�鍥剧殑澶у皬) */
+		/* 获得视图的位置信息(在加入到workbench中时,workbench会自动调整视图的大小) */
 		rtgui_widget_get_rect(RTGUI_WIDGET(view), &rect);
 		rtgui_widget_rect_to_device(RTGUI_WIDGET(view), &rect);
 		rect.x1 += 5;
@@ -62,23 +62,23 @@ rtgui_view_t* demo_view(rtgui_workbench_t* workbench, const char* title)
 		rect.x2 -= 5;
 		rect.y2 = rect.y1 + 20;
 
-		/* 鍒涘缓鏍囬�鐢ㄧ殑鏍囩� */
+		/* 创建标题用的标签 */
 		label = rtgui_label_create(title);
-		/* 璁剧疆鏍囩�浣嶇疆淇℃伅 */
+		/* 设置标签位置信息 */
 		rtgui_widget_set_rect(RTGUI_WIDGET(label), &rect);
-		/* 娣诲姞鏍囩�鍒拌�鍥句腑 */
+		/* 添加标签到视图中 */
 		rtgui_container_add_child(RTGUI_CONTAINER(view), RTGUI_WIDGET(label));
 
 		rect.y1 += 20;
 		rect.y2 += 20;
-		/* 鍒涘缓涓€涓�按骞崇殑staticline绾� */
+		/* 创建一个水平的staticline线 */
 		line = rtgui_staticline_create(RTGUI_HORIZONTAL);
-		/* 璁剧疆闈欐€佺嚎鐨勪綅缃�俊鎭� */
+		/* 设置静态线的位置信息 */
 		rtgui_widget_set_rect(RTGUI_WIDGET(line), &rect);
-		/* 娣诲姞闈欐€佺嚎鍒拌�鍥句腑 */
+		/* 添加静态线到视图中 */
 		rtgui_container_add_child(RTGUI_CONTAINER(view), RTGUI_WIDGET(line));
 
-		/* 鑾峰緱瑙嗗浘鐨勪綅缃�俊鎭� */
+		/* 获得视图的位置信息 */
 		rtgui_widget_get_rect(RTGUI_WIDGET(view), &rect);
 		rtgui_widget_rect_to_device(RTGUI_WIDGET(view), &rect);
 		rect.x2 -= 5;
@@ -86,16 +86,16 @@ rtgui_view_t* demo_view(rtgui_workbench_t* workbench, const char* title)
 		rect.x1 = rect.x2 - 100;
 		rect.y1 = rect.y2 - 25;
 
-		/* 鍒涘缓"涓嬩竴涓�"鎸夐挳 */
-		next_btn = rtgui_button_create("涓嬩竴涓�");
-		/* 璁剧疆onbutton鍔ㄤ綔鍒癲emo_view_next鍑芥暟 */
+		/* 创建"下一个"按钮 */
+		next_btn = rtgui_button_create("下一个");
+		/* 设置onbutton动作到demo_view_next函数 */
 		rtgui_button_set_onbutton(next_btn, demo_view_next);
-		/* 璁剧疆鎸夐挳鐨勪綅缃�俊鎭� */
+		/* 设置按钮的位置信息 */
 		rtgui_widget_set_rect(RTGUI_WIDGET(next_btn), &rect);
-		/* 娣诲姞鎸夐挳鍒拌�鍥句腑 */
+		/* 添加按钮到视图中 */
 		rtgui_container_add_child(RTGUI_CONTAINER(view), RTGUI_WIDGET(next_btn));
 
-		/* 鑾峰緱瑙嗗浘鐨勪綅缃�俊鎭� */
+		/* 获得视图的位置信息 */
 		rtgui_widget_get_rect(RTGUI_WIDGET(view), &rect);
 		rtgui_widget_rect_to_device(RTGUI_WIDGET(view), &rect);
 		rect.x1 += 5;
@@ -103,21 +103,21 @@ rtgui_view_t* demo_view(rtgui_workbench_t* workbench, const char* title)
 		rect.x2 = rect.x1 + 100;
 		rect.y1 = rect.y2 - 25;
 
-		/* 鍒涘缓"涓婁竴涓�"鎸夐挳 */
-		prev_btn = rtgui_button_create("涓婁竴涓�");
-		/* 璁剧疆onbutton鍔ㄤ綔鍒癲emo_view_prev鍑芥暟 */
+		/* 创建"上一个"按钮 */
+		prev_btn = rtgui_button_create("上一个");
+		/* 设置onbutton动作到demo_view_prev函数 */
 		rtgui_button_set_onbutton(prev_btn, demo_view_prev);
-		/* 璁剧疆鎸夐挳鐨勪綅缃�俊鎭� */
+		/* 设置按钮的位置信息 */
 		rtgui_widget_set_rect(RTGUI_WIDGET(prev_btn), &rect);
-		/* 娣诲姞鎸夐挳鍒拌�鍥句腑 */
+		/* 添加按钮到视图中 */
 		rtgui_container_add_child(RTGUI_CONTAINER(view), RTGUI_WIDGET(prev_btn));
 	}
 
-	/* 杩斿洖鍒涘缓鐨勮�鍥� */
+	/* 返回创建的视图 */
 	return view;
 }
 
-/* 杩欎釜鍑芥暟鐢ㄤ簬杩斿洖婕旂ず瑙嗗浘鐨勫�澶栧彲鐢ㄥ尯鍩� */
+/* 这个函数用于返回演示视图的对外可用区域 */
 void demo_view_get_rect(rtgui_view_t* view, rtgui_rect_t *rect)
 {
 	RT_ASSERT(view != RT_NULL);
@@ -125,7 +125,7 @@ void demo_view_get_rect(rtgui_view_t* view, rtgui_rect_t *rect)
 
 	rtgui_widget_get_rect(RTGUI_WIDGET(view), rect);
 	rtgui_widget_rect_to_device(RTGUI_WIDGET(view), rect);
-	/* 鍘婚櫎婕旂ず鏍囬�鍜屼笅鏂规寜閽�殑鍖哄煙 */
+	/* 去除演示标题和下方按钮的区域 */
 	rect->y1 += 45;
 	rect->y2 -= 35;
 }
@@ -136,33 +136,33 @@ void demo_view_get_logic_rect(rtgui_view_t* view, rtgui_rect_t *rect)
 	RT_ASSERT(rect != RT_NULL);
 
 	rtgui_widget_get_rect(RTGUI_WIDGET(view), rect);
-	/* 鍘婚櫎婕旂ず鏍囬�鍜屼笅鏂规寜閽�殑鍖哄煙 */
+	/* 去除演示标题和下方按钮的区域 */
 	rect->y1 += 45;
 	rect->y2 -= 35;
 }
 
-/* 褰撴槸鏍囧噯鐗堟湰鏃讹紝杩欎釜鍑芥暟鐢ㄤ簬杩斿洖鑷�姩甯冨眬寮曟搸box鎺т欢 */
+/* 当是标准版本时,这个函数用于返回自动布局引擎box控件 */
 #ifndef RTGUI_USING_SMALL_SIZE
 rtgui_box_t* demo_view_create_box(rtgui_view_t* view, int orient)
 {
 	rtgui_rect_t rect;
 	rtgui_box_t* box;
 
-	/* 鑾峰緱瑙嗗浘鐨勪綅缃�俊鎭� */
+	/* 获得视图的位置信息 */
 	rtgui_widget_get_rect(RTGUI_WIDGET(view), &rect);
 	rect.y1 += 45;
 	rect.y2 -= 25;
 
-	/* 鍒涘缓涓€涓�嚜鍔ㄥ竷灞€寮曟搸 */
+	/* 创建一个自动布局引擎 */
 	box = rtgui_box_create(orient, &rect);
-	/* 娣诲姞box鎺т欢鍒拌�鍥句腑 */
+	/* 添加box控件到视图中 */
 	rtgui_container_add_child(RTGUI_CONTAINER(view), RTGUI_WIDGET(box));
 
 	return box;
 }
 #endif
 
-/* 杩欎釜鍑芥暟鐢ㄤ簬鏄剧ず褰撳墠鐨勮�鍥� */
+/* 这个函数用于显示当前的视图 */
 void demo_view_show()
 {
 	if (demo_view_number != 0)

+ 1 - 1
examples/kernel/SConscript

@@ -32,6 +32,6 @@ heap_realloc.c
 memp_simple.c
 """)
 
-group = DefineGroup('examples', src, depend = ['RT_USING_TC'])
+group = DefineGroup('examples', src, depend = [''])
 
 Return('group')

+ 1 - 1
examples/libc/SConscript

@@ -1,6 +1,6 @@
 from building import *
 
 src   = Glob('*.c')
-group = DefineGroup('libc_test', src, depend = ['RT_USING_NEWLIB', 'RT_USING_PTHREADS', 'RT_USING_LIBC_TEST'])
+group = DefineGroup('libc_test', src, depend = ['RT_USING_NEWLIB', 'RT_USING_PTHREADS'])
 
 Return('group')