GNOME.org
 

[ease] Moved to pure vala source (no C). Removed "libease".

commit 258e46a367ecd96c0304f390769d80997aee382b
Author: Nate Stedman <natesm gmail com>
Date:   Thu May 20 05:29:29 2010 -0400

    Moved to pure vala source (no C). Removed "libease".
    
    Temporarily, Clang is the only supported compiler.
    Autotools should be coming along soon, which will fix this.

 Makefile                                |   48 ++++++------------------------
 src/{libease => }/Actor.vala            |    0
 src/{libease => }/Document.vala         |    0
 src/{libease => }/EditorEmbed.vala      |    0
 src/{libease => }/EditorWindow.vala     |    0
 src/{libease => }/Element.vala          |    0
 src/{libease => }/ElementMap.vala       |    0
 src/{libease => }/ElementMapValue.vala  |    0
 src/{libease => }/Enums.vala            |    0
 src/{libease => }/HTMLExporter.vala     |    0
 src/{libease => }/Handle.vala           |    0
 src/{libease => }/ImageActor.vala       |    0
 src/{libease => }/Main.vala             |   49 +-----------------------------
 src/{libease => }/MainToolbar.vala      |    0
 src/{libease => }/OpenDialog.vala       |    0
 src/{libease => }/Player.vala           |    0
 src/{libease => }/ScrollableEmbed.vala  |    0
 src/{libease => }/Slide.vala            |    0
 src/{libease => }/SlideActor.vala       |    0
 src/{libease => }/SlideButton.vala      |    0
 src/{libease => }/SlideButtonPanel.vala |    0
 src/{libease => }/SlidePane.vala        |    0
 src/{libease => }/TextActor.vala        |    0
 src/{libease => }/Theme.vala            |    0
 src/{libease => }/TransitionPane.vala   |    0
 src/{libease => }/Transitions.vala      |    0
 src/{libease => }/UndoActions.vala      |    0
 src/{libease => }/UndoController.vala   |    0
 src/{libease => }/VideoActor.vala       |    0
 src/{libease => }/WelcomeActor.vala     |    0
 src/{libease => }/WelcomeWindow.vala    |    0
 src/{libease => }/ZoomSlider.vala       |    0
 src/ease-player/main.c                  |   23 --------------
 src/ease/main.c                         |   24 ---------------
 34 files changed, 12 insertions(+), 132 deletions(-)
---
diff --git a/Makefile b/Makefile
index d158ab8..f0690c3 100644
--- a/Makefile
+++ b/Makefile
@@ -10,56 +10,28 @@ VALA_FLAGS = --vapidir=./vapi --pkg "glib-2.0"  --pkg "gtk+-2.0"  --pkg "clutter
 
 DOC_FLAGS = --vapidir=./vapi --pkg "glib-2.0"  --pkg "gtk+-2.0"  --pkg "clutter-1.0"  --pkg "gdk-2.0"  --pkg "libxml-2.0"  --pkg "gee-1.0"  --pkg "clutter-gtk-0.10"  --pkg "cogl-1.0" --pkg "gio-2.0" --pkg "clutter-gst-1.0"
 
-all: libease.so ease player
+all: clang
 
-libease.so: src/libease/*.vala
-	valac $(VALA_FLAGS) -C -H src/libease/libease.h src/libease/*.vala --basedir src/libease -d src/libease
-	gcc -g -O0 $(EASE_CFLAGS) --shared -fPIC src/libease/*.c -o libease.so
-	rm src/libease/*.c
-
-ease: libease.so src/ease/*.c
-	gcc -g -O0 $(EASE_CFLAGS) $(EASE_LDFLAGS) -Isrc -L. -lease src/ease/*.c -o ease
-
-player: libease.so src/ease-player/*.c
-	gcc -g -O0 $(EASE_CFLAGS) $(EASE_LDFLAGS) -Isrc -L. -lease src/ease-player/main.c -o ease-player
-	
-asone:
-	valac $(VALA_FLAGS) -C -H src/libease/libease.h src/libease/*.vala --basedir src/libease -d src/libease
-	gcc -O0 $(EASE_CFLAGS) $(EASE_LDFLAGS) -fPIC src/libease/*.c src/ease/*.c -o ease
-	rm src/libease/*.c
-
-clang:
-	valac $(VALA_FLAGS) -C -H src/libease/libease.h src/libease/*.vala --basedir src/libease -d src/libease
-	clang $(EASE_CFLAGS) $(EASE_LDFLAGS) -Wno-unused-value -Wno-pointer-sign -Wno-switch-enum -o ease src/libease/*.c src/ease/main.c
-	rm src/libease/*.c
+clang: src/*.vala
+	valac $(VALA_FLAGS) -C -H src/libease.h src/*.vala --basedir src/ -d src/
+	clang -O0 $(EASE_CFLAGS) $(EASE_LDFLAGS) -Wno-unused-value -Wno-pointer-sign -Wno-switch-enum -o ease src/*.c
+	rm src/*.c
 	
 vapi:
 
-doc: src/libease/*.vala
+doc: src/*.vala
 	rm -rf doc
-	valadoc $(DOC_FLAGS) --directory=./doc ./src/libease/*.vala
+	valadoc $(DOC_FLAGS) --directory=./doc ./src/*.vala
 
 todo:
-	grep -n "TODO" src/libease/*.vala src/ease/*.c src/ease-player/*.c | less
+	grep -n "TODO" src/*.vala | less
 
 gitclean:
 	git clean -x -f -d
 
 clean:
-	rm -f src/libease/*.o src/libease/*.so src/libease/*.vapi
-	rm -f src/ease/*.o
-	rm -f src/ease-player/*.o
-	rm -f src/libease/*.c
+	rm -f src/*.o src/*.so src/*.vapi
+	rm -f src/*.c
 	rm -f ease
-	rm -f ease-player
-	rm -f libease.so
 	rm -rf doc
 
-run: all
-	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:. ./ease
-	
-play: player
-	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:. ./ease-player ./Examples/RCOS.ease/
-	
-edit: ease
-	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:. ./ease ./Examples/RCOS.ease/
diff --git a/src/libease/Actor.vala b/src/Actor.vala
similarity index 100%
rename from src/libease/Actor.vala
rename to src/Actor.vala
diff --git a/src/libease/Document.vala b/src/Document.vala
similarity index 100%
rename from src/libease/Document.vala
rename to src/Document.vala
diff --git a/src/libease/EditorEmbed.vala b/src/EditorEmbed.vala
similarity index 100%
rename from src/libease/EditorEmbed.vala
rename to src/EditorEmbed.vala
diff --git a/src/libease/EditorWindow.vala b/src/EditorWindow.vala
similarity index 100%
rename from src/libease/EditorWindow.vala
rename to src/EditorWindow.vala
diff --git a/src/libease/Element.vala b/src/Element.vala
similarity index 100%
rename from src/libease/Element.vala
rename to src/Element.vala
diff --git a/src/libease/ElementMap.vala b/src/ElementMap.vala
similarity index 100%
rename from src/libease/ElementMap.vala
rename to src/ElementMap.vala
diff --git a/src/libease/ElementMapValue.vala b/src/ElementMapValue.vala
similarity index 100%
rename from src/libease/ElementMapValue.vala
rename to src/ElementMapValue.vala
diff --git a/src/libease/Enums.vala b/src/Enums.vala
similarity index 100%
rename from src/libease/Enums.vala
rename to src/Enums.vala
diff --git a/src/libease/HTMLExporter.vala b/src/HTMLExporter.vala
similarity index 100%
rename from src/libease/HTMLExporter.vala
rename to src/HTMLExporter.vala
diff --git a/src/libease/Handle.vala b/src/Handle.vala
similarity index 100%
rename from src/libease/Handle.vala
rename to src/Handle.vala
diff --git a/src/libease/ImageActor.vala b/src/ImageActor.vala
similarity index 100%
rename from src/libease/ImageActor.vala
rename to src/ImageActor.vala
diff --git a/src/libease/Main.vala b/src/Main.vala
similarity index 77%
rename from src/libease/Main.vala
rename to src/Main.vala
index 65eb422..92b566e 100644
--- a/src/libease/Main.vala
+++ b/src/Main.vala
@@ -37,17 +37,10 @@ public static class Ease.Main : GLib.Object
 	 * will open an { link EditorWindow}. Otherwise, a { link WelcomeWindow}
 	 * will be opened.
 	 *
-	 * @param argc Standard argc, passed through from C.
-	 * @param argv Standard argv, passed through from C.
+	 * @param args Program arguments.
 	 */
-	public static int main_editor(int argc, char** argv)
+	public static int main(string[] args)
 	{
-		string[] args = new string[argc];
-		for (var i = 0; i < argc; i++)
-		{
-			args[i] = (string)argv[i];
-		}
-	
 		GtkClutter.init(ref args);
 		Gst.init(ref args);
 		ClutterGst.init(ref args);
@@ -71,44 +64,6 @@ public static class Ease.Main : GLib.Object
 		return 0;
 	}
 
-	/**
-	 * Starts Ease to play back a file.
-	 * 
-	 * This function is primarily used by the ease-player executable. It runs
-	 * the slideshow, then exits. If no filename is given, it immediately
-	 * returns.
-	 *
-	 * @param argc Standard argc, passed through from C.
-	 * @param argv Standard argv, passed through from C.
-	 */
-	public static int main_player(int argc, char** argv)
-	{
-		string[] args = new string[argc];
-		for (var i = 0; i < argc; i++)
-		{
-			args[i] = (string)argv[i];
-		}
-	
-		if (args.length < 2)
-		{
-			return 0;
-		}
-	
-		GtkClutter.init(ref args);
-		Gst.init(ref args);
-		ClutterGst.init(ref args);
-	
-		var doc = new Document.from_file(args[1]);
-		var player = new Player(doc);
-		player.stage.hide.connect(() => {
-			Gtk.main_quit();
-		});
-	
-		Gtk.main();
-	
-		return 0;
-	}
-
 	public static void test_editor(string path)
 	{
 		add_window(new EditorWindow(path));
diff --git a/src/libease/MainToolbar.vala b/src/MainToolbar.vala
similarity index 100%
rename from src/libease/MainToolbar.vala
rename to src/MainToolbar.vala
diff --git a/src/libease/OpenDialog.vala b/src/OpenDialog.vala
similarity index 100%
rename from src/libease/OpenDialog.vala
rename to src/OpenDialog.vala
diff --git a/src/libease/Player.vala b/src/Player.vala
similarity index 100%
rename from src/libease/Player.vala
rename to src/Player.vala
diff --git a/src/libease/ScrollableEmbed.vala b/src/ScrollableEmbed.vala
similarity index 100%
rename from src/libease/ScrollableEmbed.vala
rename to src/ScrollableEmbed.vala
diff --git a/src/libease/Slide.vala b/src/Slide.vala
similarity index 100%
rename from src/libease/Slide.vala
rename to src/Slide.vala
diff --git a/src/libease/SlideActor.vala b/src/SlideActor.vala
similarity index 100%
rename from src/libease/SlideActor.vala
rename to src/SlideActor.vala
diff --git a/src/libease/SlideButton.vala b/src/SlideButton.vala
similarity index 100%
rename from src/libease/SlideButton.vala
rename to src/SlideButton.vala
diff --git a/src/libease/SlideButtonPanel.vala b/src/SlideButtonPanel.vala
similarity index 100%
rename from src/libease/SlideButtonPanel.vala
rename to src/SlideButtonPanel.vala
diff --git a/src/libease/SlidePane.vala b/src/SlidePane.vala
similarity index 100%
rename from src/libease/SlidePane.vala
rename to src/SlidePane.vala
diff --git a/src/libease/TextActor.vala b/src/TextActor.vala
similarity index 100%
rename from src/libease/TextActor.vala
rename to src/TextActor.vala
diff --git a/src/libease/Theme.vala b/src/Theme.vala
similarity index 100%
rename from src/libease/Theme.vala
rename to src/Theme.vala
diff --git a/src/libease/TransitionPane.vala b/src/TransitionPane.vala
similarity index 100%
rename from src/libease/TransitionPane.vala
rename to src/TransitionPane.vala
diff --git a/src/libease/Transitions.vala b/src/Transitions.vala
similarity index 100%
rename from src/libease/Transitions.vala
rename to src/Transitions.vala
diff --git a/src/libease/UndoActions.vala b/src/UndoActions.vala
similarity index 100%
rename from src/libease/UndoActions.vala
rename to src/UndoActions.vala
diff --git a/src/libease/UndoController.vala b/src/UndoController.vala
similarity index 100%
rename from src/libease/UndoController.vala
rename to src/UndoController.vala
diff --git a/src/libease/VideoActor.vala b/src/VideoActor.vala
similarity index 100%
rename from src/libease/VideoActor.vala
rename to src/VideoActor.vala
diff --git a/src/libease/WelcomeActor.vala b/src/WelcomeActor.vala
similarity index 100%
rename from src/libease/WelcomeActor.vala
rename to src/WelcomeActor.vala
diff --git a/src/libease/WelcomeWindow.vala b/src/WelcomeWindow.vala
similarity index 100%
rename from src/libease/WelcomeWindow.vala
rename to src/WelcomeWindow.vala
diff --git a/src/libease/ZoomSlider.vala b/src/ZoomSlider.vala
similarity index 100%
rename from src/libease/ZoomSlider.vala
rename to src/ZoomSlider.vala
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]