From 1b6bdab7661cdb9a66535ce03e98cc427f276538 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 28 Jul 2008 22:21:17 +0000
Subject: Remove annoying set_dev_environment.sh script in favour of
 progs/ingen/ingen.dev wrapper script.

git-svn-id: http://svn.drobilla.net/lad/ingen@1295 a436a847-0d15-0410-975c-d299462d15a1
---
 src/libs/module/Module.cpp | 3 ++-
 src/progs/ingen/ingen.dev  | 5 +++++
 src/progs/ingen/main.cpp   | 6 +-----
 src/set_dev_environment.sh | 8 --------
 4 files changed, 8 insertions(+), 14 deletions(-)
 create mode 100755 src/progs/ingen/ingen.dev
 delete mode 100755 src/set_dev_environment.sh

(limited to 'src')

diff --git a/src/libs/module/Module.cpp b/src/libs/module/Module.cpp
index 8f3d6e81..8d1399b1 100644
--- a/src/libs/module/Module.cpp
+++ b/src/libs/module/Module.cpp
@@ -78,7 +78,8 @@ load_module(const string& name)
 		cerr << "Loaded module \"" <<  name << "\" from " << INGEN_MODULE_DIR << endl;
 		return SharedPtr<Glib::Module>(module);
 	} else {
-		cerr << "Unable to load module \"" <<  name << "\" (try setting INGEN_MODULE_PATH)." << endl;
+		cerr << "Unable to load module \"" <<  name << "\", is Ingen installed?" << endl
+			<< "Use ./ingen.dev to run from the source tree." << endl;
 		return SharedPtr<Glib::Module>();
 	}
 }
diff --git a/src/progs/ingen/ingen.dev b/src/progs/ingen/ingen.dev
new file mode 100755
index 00000000..023eba7e
--- /dev/null
+++ b/src/progs/ingen/ingen.dev
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+export INGEN_MODULE_PATH="`pwd`/../../libs/engine/.libs:`pwd`/../../libs/serialisation/.libs:`pwd`/../../libs/gui/.libs:`pwd`/../../libs/client/.libs:`pwd`/../../bindings/.libs"
+export INGEN_GLADE_PATH="`pwd`/../../libs/gui/ingen_gui.glade"
+./ingen $@
diff --git a/src/progs/ingen/main.cpp b/src/progs/ingen/main.cpp
index 64cfd36b..5be5a8d3 100644
--- a/src/progs/ingen/main.cpp
+++ b/src/progs/ingen/main.cpp
@@ -109,8 +109,7 @@ main(int argc, char** argv)
 				engine_module.reset();
 			}
 		} else {
-			cerr << "Unable to load engine module, engine not loaded." << endl;
-			cerr << "Try using src/set_dev_environment.sh, or setting INGEN_MODULE_PATH." << endl;
+			cerr << "Unable to load engine module." << endl;
 		}
 
 	}
@@ -132,7 +131,6 @@ main(int argc, char** argv)
 			use_osc = true;
 		} else {
 			cerr << "Unable to load ingen_client module, aborting." << endl;
-			cerr << "Try using src/set_dev_environment.sh, or setting INGEN_MODULE_PATH." << endl;
 			return -1;
 		}
 	}
@@ -186,7 +184,6 @@ main(int argc, char** argv)
 
 		} else {
 			cerr << "Unable to load serialisation module, aborting." << endl;
-			cerr << "Try using src/set_dev_environment.sh, or setting INGEN_MODULE_PATH." << endl;
 			return -1;
 		}
 	}
@@ -204,7 +201,6 @@ main(int argc, char** argv)
 			run(argc, argv, world);
 		} else {
 			cerr << "Unable to find GUI module, GUI not loaded." << endl;
-			cerr << "Try using src/set_dev_environment.sh, or setting INGEN_MODULE_PATH." << endl;
 		}
 	}
 
diff --git a/src/set_dev_environment.sh b/src/set_dev_environment.sh
deleted file mode 100755
index 63031123..00000000
--- a/src/set_dev_environment.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-
-# Source this file (e.g ". set_dev_environment.sh") to set up a development
-# environment so dynamic modules in the source tree will be found and the
-# executables can be run directly, or in gdb/valgrind/etc.
-
-export INGEN_MODULE_PATH="`pwd`/libs/engine/.libs:`pwd`/libs/serialisation/.libs:`pwd`/libs/gui/.libs:`pwd`/libs/client/.libs:`pwd`/bindings/.libs"
-export INGEN_GLADE_PATH="`pwd`/libs/gui/ingen_gui.glade"
-- 
cgit v1.2.1