[MOSYNC-17] Updated example workfiles. Added some helpful functions t…

…o /rules/.
ronald132 · Oct 6, 2011 · 8de3f42 · 8de3f42
1 parent 70c8736
commit 8de3f42
Show file tree

Hide file tree

Showing 67 changed files with 371 additions and 189 deletions.
diff --git a/examples/3dLines/workfile.rb b/examples/3dLines/workfile.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
+work.instance_eval do
 	@SOURCES = ["."]
 	@EXTRA_CPPFLAGS = " -Wno-shadow"
 	@NAME = "3dLines"

diff --git a/examples/AdvGraphics/workfile.rb b/examples/AdvGraphics/workfile.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
+work.instance_eval do
 	@SOURCES = ["."]
 	@EXTRA_CPPFLAGS = " -Wno-shadow"
 	@NAME = "AdvGraphics"

diff --git a/examples/BluetoothClient/workfile.rb b/examples/BluetoothClient/workfile.rb
@@ -1,12 +1,12 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
+work.instance_eval do
 	@SOURCES = ["."]
 	@LIBRARIES = ["mautil"]
 	@NAME = "BluetoothClient"
 end
 
-work.invoke
+work.invoke
diff --git a/examples/BluetoothServer/workfile.rb b/examples/BluetoothServer/workfile.rb
@@ -1,12 +1,12 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
+work.instance_eval do
 	@SOURCES = ["."]
 	@LIBRARIES = ["mautil"]
 	@NAME = "BluetoothServer"
 end
 
-work.invoke
+work.invoke
diff --git a/examples/CameraDemo/ImageScreen.cpp b/examples/CameraDemo/ImageScreen.cpp
@@ -47,7 +47,7 @@ void ImageScreen::buttonClicked(Widget* button)
 /**
  * Lazy initializations
  */
-int ImageScreen::initialize(StackScreen* stackScreen)
+void ImageScreen::initialize(StackScreen* stackScreen)
 {
 	mStackScreen = stackScreen;
 	createUI();

diff --git a/examples/CameraDemo/ImageScreen.h b/examples/CameraDemo/ImageScreen.h
@@ -53,7 +53,7 @@ class ImageScreen : public ButtonListener
 
 	virtual void buttonClicked(Widget* button);
 
-	int initialize(StackScreen* stackScreen);
+	void initialize(StackScreen* stackScreen);
 
 	void pushImageScreen();
 

diff --git a/examples/CameraDemo/SettingsScreen.cpp b/examples/CameraDemo/SettingsScreen.cpp
@@ -81,7 +81,7 @@ void SettingsScreen::buttonClicked(Widget* button)
 /**
  * Lazy initialization
  */
-int SettingsScreen::initialize(StackScreen* stackScreen, CameraPreview* previewWidget)
+void SettingsScreen::initialize(StackScreen* stackScreen, CameraPreview* previewWidget)
 {
 	mPreviewWidget = previewWidget;
 	mStackScreen = stackScreen;
@@ -167,7 +167,7 @@ void SettingsScreen::pushSettingsScreen()
 /**
  * A wrapper for iterating over flash modes
  */
-char* SettingsScreen::getModeForIndex( int index)
+const char* SettingsScreen::getModeForIndex( int index)
 {
 	switch(index)
 	{
@@ -195,7 +195,7 @@ int SettingsScreen::getCurrentCamera()
 /**
  * Returns the selected flash mode
  */
-char * SettingsScreen::getFLashMode()
+const char * SettingsScreen::getFLashMode()
 {
 	return getModeForIndex(flashModeIndex);
 }
diff --git a/examples/CameraDemo/SettingsScreen.h b/examples/CameraDemo/SettingsScreen.h
@@ -52,13 +52,13 @@ class SettingsScreen : public ButtonListener
 
 	virtual void buttonClicked(Widget* button);
 
-	int initialize(StackScreen* stackScreen, CameraPreview* previewWidget);
+	void initialize(StackScreen* stackScreen, CameraPreview* previewWidget);
 
 	void pushSettingsScreen();
 
 	int getCurrentCamera();
 
-	char * getFLashMode();
+	const char * getFLashMode();
 
 	bool flashSupported;
 
@@ -68,7 +68,7 @@ class SettingsScreen : public ButtonListener
 
 	void createUI();
 
-	char * getModeForIndex(int index);
+	const char * getModeForIndex(int index);
 
 	Screen *mScreen;
 

diff --git a/examples/CameraDemo/WidgetUtil.cpp b/examples/CameraDemo/WidgetUtil.cpp
@@ -18,7 +18,7 @@ MA 02110-1301, USA.
 
 /**
  * @file WidgetUtil.h
- * @author Mattias Frånberg and Chris Hughes
+ * @author Mattias Frånberg and Chris Hughes
  *
  * Implementation of basic utilities that get and set widget properties.
  */
@@ -46,7 +46,7 @@ int widgetSetPropertyInt(MAHandle handle, const char *property, int value)
 {
 	char buffer[256];
 	sprintf(buffer, "%i", value);
-	maWidgetSetProperty( handle, property, buffer );
+	return maWidgetSetProperty( handle, property, buffer );
 }
 
 /**

diff --git a/examples/CameraDemo/main.cpp b/examples/CameraDemo/main.cpp
@@ -86,7 +86,7 @@ class AppScreen : public ButtonListener, public StackScreenListener
 		// Make the AppScreen listen for events coming from widgets.
 		//MAUtil::Environment::getEnvironment().addCustomEventListener(this);
 		char buffer[256];
-		int length = maCameraGetProperty(MA_CAMERA_MAX_ZOOM, buffer, 256);
+		maCameraGetProperty(MA_CAMERA_MAX_ZOOM, buffer, 256);
 		maxZoom = atoi(buffer);
 		createMainScreen();
 		mStackScreen = new StackScreen();
@@ -248,11 +248,11 @@ class AppScreen : public ButtonListener, public StackScreenListener
 		maCameraSelect(mSettingsScreen->getCurrentCamera());
 		mCameraPreview->bindToCurrentCamera();
 		maCameraSetProperty(
-				MA_CAMERA_FLASH_MODE,
-				mSettingsScreen->getFLashMode()
-				);
+			MA_CAMERA_FLASH_MODE,
+			mSettingsScreen->getFLashMode()
+			);
 		char buffer[256];
-		int length = maCameraGetProperty(MA_CAMERA_MAX_ZOOM, buffer, 256);
+		maCameraGetProperty(MA_CAMERA_MAX_ZOOM, buffer, 256);
 		maxZoom = atoi(buffer);
 
 		//Disable the zoom buttons if zoom is not supported

diff --git a/examples/CameraDemo/workfile.rb b/examples/CameraDemo/workfile.rb
@@ -1,12 +1,13 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
 work.instance_eval do
-	@SOURCES = ["."]
-	@LIBRARIES = ["mautil"]
-	@NAME = "HelloNativeUI"
+	@SOURCES = ['.']
+	@LIBRARIES = ['mautil', 'nativeui']
+	@EXTRA_LINKFLAGS = standardMemorySettings(11)
+	@NAME = 'CameraDemo'
 end
 
 work.invoke
diff --git a/examples/DeviceFonts/workfile.rb b/examples/DeviceFonts/workfile.rb
@@ -0,0 +1,12 @@
+#!/usr/bin/ruby
+
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
+
+work = PipeExeWork.new
+work.instance_eval do
+	@SOURCES = ['.']
+	@LIBRARIES = ['mautil']
+	@NAME = 'DeviceFonts'
+end
+
+work.invoke
diff --git a/examples/DeviceFontsNativeUI/workfile.rb b/examples/DeviceFontsNativeUI/workfile.rb
@@ -0,0 +1,13 @@
+#!/usr/bin/ruby
+
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
+
+work = PipeExeWork.new
+work.instance_eval do
+	@SOURCES = ['.']
+	@LIBRARIES = ['mautil', 'nativeui']
+	@EXTRA_LINKFLAGS = standardMemorySettings(9) unless(USE_NEWLIB)
+	@NAME = 'DeviceFontsNativeUI'
+end
+
+work.invoke
diff --git a/examples/Graphun/workfile.rb b/examples/Graphun/workfile.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
 work.instance_eval do

diff --git a/examples/HelloMAUI/workfile.rb b/examples/HelloMAUI/workfile.rb
@@ -1,12 +1,12 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
-	@SOURCES = ["."]	
+work.instance_eval do
+	@SOURCES = ["."]
 	@LIBRARIES = ["mautil", "maui"]
-	@EXTRA_LINKFLAGS = " -datasize=256000 -heapsize=128000 -stacksize=16000"
+	@EXTRA_LINKFLAGS = " -datasize=256000 -heapsize=128000 -stacksize=16000" unless(USE_NEWLIB)
 	@NAME = "HelloMAUI"
 end
 

diff --git a/examples/HelloMap/workfile.rb b/examples/HelloMap/workfile.rb
@@ -1,12 +1,13 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
+work.instance_eval do
 	@SOURCES = ["."]
 	@LSTFILES = ["Res/res.lst"]
 	@LIBRARIES = ["mautil", "map", "maui"]
+	@EXTRA_LINKFLAGS = standardMemorySettings(11)
 	@NAME = "HelloMap"
 end
 

diff --git a/examples/HelloNativeUI/main.cpp b/examples/HelloNativeUI/main.cpp
@@ -19,7 +19,7 @@ MA 02110-1301, USA.
 
 /**
  * @file main.cpp
- * @author Mattias Frånberg and Chris Hughes
+ * @author Mattias Frånberg and Chris Hughes
  *
  * This application provides a very basic example of how to work
  * with Native UI to position and and manipulate graphical user
@@ -77,6 +77,7 @@ class NativeUIMoblet : public Moblet
 	 * This method is called when the application is closed.
 	 */
 	void NativeUIMoblet::closeEvent()
+	GCCATTRIB(noreturn)
 	{
 		// Deallocate the main screen.
 		delete mMainScreen;

diff --git a/examples/HelloNativeUI/workfile.rb b/examples/HelloNativeUI/workfile.rb
@@ -1,11 +1,12 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
-	@SOURCES = ["."]	
+work.instance_eval do
+	@SOURCES = ["."]
 	@LIBRARIES = ["mautil","nativeui"]
+	@EXTRA_LINKFLAGS = standardMemorySettings(11)
 	@NAME = "HelloNativeUI"
 end
 

diff --git a/examples/HelloOpenGLES/workfile.rb b/examples/HelloOpenGLES/workfile.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
+work.instance_eval do
 	@SOURCES = ["."]
 	@LIBRARIES = ["mautil"]
 	@NAME = "HelloOpenGLES"

diff --git a/examples/HelloWorld/workfile.rb b/examples/HelloWorld/workfile.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
+work.instance_eval do
 	@SOURCES = ["."]
 	@LIBRARIES = ["mautil"]
 	@NAME = "HelloWorld"

diff --git a/examples/MAStx/workfile.rb b/examples/MAStx/workfile.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
+work.instance_eval do
 	@SOURCES = ["."]
 	@EXTRA_CFLAGS = " -Wno-unreachable-code"
 	if(USE_NEWLIB)

diff --git a/examples/MAUI/MAUIex/workfile.rb b/examples/MAUI/MAUIex/workfile.rb
@@ -1,12 +1,13 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
+work.instance_eval do
 	@SOURCES = ["."]
 	@EXTRA_CPPFLAGS = " -Wno-shadow"
 	@LIBRARIES = ["mautil", "maui"]
+	@EXTRA_LINKFLAGS = standardMemorySettings(8) unless(USE_NEWLIB)
 	@NAME = "MAUIex"
 end
 

diff --git a/examples/MapDemo/workfile.rb b/examples/MapDemo/workfile.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
 work.instance_eval do

diff --git a/examples/MinUI/workfile.rb b/examples/MinUI/workfile.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
+work.instance_eval do
 	@SOURCES = ["."]
 	@LIBRARIES = ["mautil"]
 	@NAME = "MinUI"

diff --git a/examples/MoSketch/workfile.rb b/examples/MoSketch/workfile.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
+work.instance_eval do
 	@SOURCES = ["."]
 	@NAME = "MoSketch"
 end

diff --git a/examples/MoSound/workfile.rb b/examples/MoSound/workfile.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
+work.instance_eval do
 	@SOURCES = ["."]
 	@NAME = "MoSketch"
 end

diff --git a/examples/MoTris/workfile.rb b/examples/MoTris/workfile.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/ruby
 
-require File.expand_path('../../rules/mosync_exe.rb')
+require File.expand_path(ENV['MOSYNCDIR']+'/rules/mosync_exe.rb')
 
 work = PipeExeWork.new
-work.instance_eval do 
+work.instance_eval do
 	@SOURCES = ["."]
 	@EXTRA_CPPFLAGS = " -Wno-shadow"
 	@LSTFILES = ["Res/res.lst"]