- If the submodule doesn't eixst yet, then submodule update is called
- If the submodule points at the right commit then nothing happens.
- If the submodule is pointed at any other commit, this script will attempt to rebase.
- If the rebase fails (for any reason!) then the local HEAD is used rather than just switching to whatever upstream uses.
All automatic updating is disabled by default.
Set submodule.update=true in private.properties to enable.
Change-Id: I9f370a33001bbfea5079687a41cc9cbfa07eea33
Reviewed-on: http://gerrit.dmdirc.com/326
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
xvfb.disable=true will allow building without, even if xvfb is found.
Fixes issue 3422
Change-Id: I012bdfc694da10eac9a5afd1346841c4164ac386
Reviewed-on: http://gerrit.dmdirc.com/328
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Tested-by: Shane Mc Cormack <shane@dmdirc.com>
If submodule.noupdate=true is defined in private.properties, then the user is responsible for updating submodules themselves rather than having it handled automatically.
Fix ant complaining about modules/plugins/lib not existing if it hasn't been checked out yet.
Change-Id: Iba429fcdee0d4b9e546101c1a28dffb32ffbb842
Reviewed-on: http://gerrit.dmdirc.com/325
Tested-by: Shane Mc Cormack <shane@dmdirc.com>
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Fix servers not using correct server name for identities
The server's "name" is now customisable by the user and is only set
after the ConfigManager is migrated, so it's not suitable any more.
Change-Id: Ib50a3b11594b75dfdd55900c281fed2480134113
Reviewed-on: http://gerrit.dmdirc.com/292
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Tested-by: Shane Mc Cormack <shane@dmdirc.com>
Classpath changes, move the classpath definitions to the bottom of the file and all next to each other rather than scatter about the file.
Put ${toString:plugins.libs} into the properties file rather than build-impl.xml
Unfortunately netbeans sucks and doesn't understand ${toString:plugins.libs} so refuses to acknowledge the libs at all (even tho compiling will work just fine), to counter this the user is now able to define private.classpath to (re-)include the jars that netbeans otherwise misses. Unfortunately I can't get netbeans to work any other way and neither ant or netbeans understand wildcards in the classpath.
Change-Id: I1aa6b7ba5eeeffaa2e7e8d43834af4082e0d9d04
Reviewed-on: http://gerrit.dmdirc.com/275
Tested-by: Shane Mc Cormack <shane@dmdirc.com>
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Remove references to git from build scripts and the like.
Would appreviate a full review of this to make sure I didn't miss anything or delete the wrong stuff!
Change-Id: Iff32442f0fe317955f5122ced3d6cf95c4436982
Reviewed-on: http://gerrit.dmdirc.com/238
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>
Uses version from git submodule
Copies and overwrites settings from submodule
Removed all the default config from the source tree
Issue 2734
Change-Id: Iebda026cf9e78a229f50232634527562b4216be9
Reviewed-on: http://gerrit.dmdirc.com/236
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Git
Chris Smith