Merge branch 'master' into ratatoskr

Conflicts: dists/OBS/debian.rules qt/debian/midgard2-runtime.install
midgardproject · May 27, 2010 · b91bda6 · b91bda6
2 parents f4e9029 + 5a04046
commit b91bda6
Show file tree

Hide file tree

Showing 36 changed files with 12 additions and 91 deletions.
diff --git a/dists/OBS/debian.changelog b/dists/OBS/debian.changelog
diff --git a/dists/OBS/debian.control b/dists/OBS/debian.control
diff --git a/dists/OBS/debian.rules b/dists/OBS/debian.rules
diff --git a/dists/OBS/midgard2-runtime.dsc b/dists/OBS/midgard2-runtime.dsc
diff --git a/osx/README b/osx/README
@@ -0,0 +1,7 @@
+# The plan
+
+1) Make sure we can install all the midgard2 crap via some port/build system and that it's working
+2) Check the broken shit with gda4 and fixed-paths. Could be we need to patch it manually (= create our own homebrew/ports recepie with patches for relocation)
+3) Create the scripts (basically take from Builder and modify) the scripts that properly relocate the whole lib structure for bundle packaging
+4) Create a basic XCode project that does nothing but just packs the libs correctly and sets the paths correctly
+5) Actually write the runtime code.
diff --git a/.gitignore → qt/.gitignore b/.gitignore → qt/.gitignore
diff --git a/AUTHORS → qt/AUTHORS b/AUTHORS → qt/AUTHORS
diff --git a/COPYING → qt/COPYING b/COPYING → qt/COPYING
diff --git a/MAINTAINERS → qt/MAINTAINERS b/MAINTAINERS → qt/MAINTAINERS
diff --git a/NEWS → qt/NEWS b/NEWS → qt/NEWS
diff --git a/README → qt/README b/README → qt/README
diff --git a/debian/changelog → qt/debian/changelog b/debian/changelog → qt/debian/changelog
diff --git a/debian/control → qt/debian/control b/debian/control → qt/debian/control
diff --git a/debian/midgard2-runtime.dsc → qt/debian/midgard2-runtime.dsc b/debian/midgard2-runtime.dsc → qt/debian/midgard2-runtime.dsc
diff --git a/qt/debian/midgard2-runtime.install b/qt/debian/midgard2-runtime.install
@@ -0,0 +1 @@
+usr/bin/midgard2-runtime
diff --git a/debian/rules → qt/debian/rules b/debian/rules → qt/debian/rules
diff --git a/midgard-runtime.pro → qt/midgard-runtime.pro b/midgard-runtime.pro → qt/midgard-runtime.pro
diff --git a/src/.gitignore → qt/src/.gitignore b/src/.gitignore → qt/src/.gitignore
diff --git a/src/main.cpp → qt/src/main.cpp b/src/main.cpp → qt/src/main.cpp
diff --git a/src/mainwindow.cpp → qt/src/mainwindow.cpp b/src/mainwindow.cpp → qt/src/mainwindow.cpp
diff --git a/src/mainwindow.h → qt/src/mainwindow.h b/src/mainwindow.h → qt/src/mainwindow.h
diff --git a/src/midgard2-icon.png → qt/src/midgard2-icon.png b/src/midgard2-icon.png → qt/src/midgard2-icon.png
diff --git a/src/midgard2-runtime-installer → qt/src/midgard2-runtime-installer b/src/midgard2-runtime-installer → qt/src/midgard2-runtime-installer
diff --git a/src/midgard2-runtime.qrc → qt/src/midgard2-runtime.qrc b/src/midgard2-runtime.qrc → qt/src/midgard2-runtime.qrc
diff --git a/src/phpprocess.cpp → qt/src/phpprocess.cpp b/src/phpprocess.cpp → qt/src/phpprocess.cpp
diff --git a/src/phpprocess.h → qt/src/phpprocess.h b/src/phpprocess.h → qt/src/phpprocess.h
diff --git a/src/runtime.cpp → qt/src/runtime.cpp b/src/runtime.cpp → qt/src/runtime.cpp
diff --git a/src/runtime.h → qt/src/runtime.h b/src/runtime.h → qt/src/runtime.h
diff --git a/src/runtimeprocess.cpp → qt/src/runtimeprocess.cpp b/src/runtimeprocess.cpp → qt/src/runtimeprocess.cpp
diff --git a/src/runtimeprocess.h → qt/src/runtimeprocess.h b/src/runtimeprocess.h → qt/src/runtimeprocess.h
diff --git a/src/sconnect.h → qt/src/sconnect.h b/src/sconnect.h → qt/src/sconnect.h
diff --git a/src/sfYaml.php → qt/src/sfYaml.php b/src/sfYaml.php → qt/src/sfYaml.php
diff --git a/src/sfYamlDumper.php → qt/src/sfYamlDumper.php b/src/sfYamlDumper.php → qt/src/sfYamlDumper.php
diff --git a/src/sfYamlInline.php → qt/src/sfYamlInline.php b/src/sfYamlInline.php → qt/src/sfYamlInline.php
diff --git a/src/sfYamlParser.php → qt/src/sfYamlParser.php b/src/sfYamlParser.php → qt/src/sfYamlParser.php
diff --git a/src/src.pro → qt/src/src.pro b/src/src.pro → qt/src/src.pro
@@ -3,3 +3,7 @@ SOURCES = main.cpp mainwindow.cpp phpprocess.cpp runtime.cpp runtimeprocess.cpp
 HEADERS = mainwindow.h phpprocess.h runtime.h runtimeprocess.h sconnect.h
 QT += webkit network
 RESOURCES = midgard2-runtime.qrc
+
+bin.path = /usr/bin/
+bin.files = midgard2-runtime
+INSTALLS += bin