Permalink
Browse files

Merge remote branch 'origin/master' into qt

Conflicts:
	.hgignore (manual merge)
	lib/framework/wzapp_c.h (used qt)
	macosx/Warzone.xcodeproj/project.pbxproj (used qt)
	po/*.po (used master)
  • Loading branch information...
2 parents a84749c + 00d69c1 commit 60d7cb6127a7d31eed533ca689ee1749815ea253 @Cyp Cyp committed Nov 21, 2010
Showing 390 changed files with 32,359 additions and 13,963 deletions.
View
@@ -180,6 +180,7 @@ tools/qwzm/ui_qwzm.h
.DS_Store
*.pbxuser
*.perspectivev3
+macosx/configs/codeident
# build folders
/macosx/build/
@@ -214,3 +215,6 @@ data/*.dll
data/config/*
data/etc/*
devpkg/*
+
+# profiler stuff
+win32/CodeAnalyst
View
@@ -1,12 +1,14 @@
-# Mac clutter
syntax: glob
+
+# Mac clutter
.DS_Store
Icon?
._*
macosx/build/*
macosx/external/*
macosx/prebuilt/*
+macosx/configs/codeident
*.pbxuser
*.perspectivev3
@@ -93,6 +93,10 @@ class assign_once : public T
struct RevisionInformation
{
RevisionInformation() :
+ low_revision("unknown"),
+ revision("unknown"),
+ low_revisionCount("-1"),
+ revisionCount("-1"),
wc_modified(false),
wc_switched(false)
{}
@@ -229,10 +233,11 @@ class RevGitQuery : public RevisionExtractor
virtual bool extractRevision(RevisionInformation& rev_info);
private:
- std::string runCommand(char const *cmd) const;
+ std::string runCommand(char const *cmd);
private:
const std::string _workingDir;
+ int exitStatus;
};
class RevConfigFile : public RevisionExtractor
@@ -308,11 +313,15 @@ int main(int argc, char** argv)
RevConfigFile revRetr4(workingDir + "/autorevision.conf");
RevFileParse revRetr3(workingDir + "/_svn/entries", &revRetr4);
RevFileParse revRetr2(workingDir + "/.svn/entries", &revRetr3);
+ /*
RevGitSVNQuery revRetr2_2(workingDir, &revRetr2);
RevGitQuery revRetr2_1(workingDir, &revRetr2_2);
RevSVNQuery revRetr1(workingDir, &revRetr2_1);
RevSVNVersionQuery revRetr(workingDir, &revRetr1);
+ */
+ // Don't check SVN, since something is modifying wc_modified, which isn't an assign_once, and couldn't be bothered to fix it.
+ RevGitQuery revRetr(workingDir, &revRetr2);
// Strings to extract Subversion information we want into
RevisionInformation rev_info;
@@ -618,8 +627,10 @@ bool RevGitSVNQuery::extractRevision(RevisionInformation& rev_info)
return RevisionExtractor::extractRevision(rev_info);
}
-std::string RevGitQuery::runCommand(char const *cmd) const
+std::string RevGitQuery::runCommand(char const *cmd)
{
+ exitStatus = -1;
+
std::string result;
const string cwd(GetWorkingDir());
@@ -643,7 +654,7 @@ std::string RevGitQuery::runCommand(char const *cmd) const
removeAfterNewLine(result);
}
- pclose(process);
+ exitStatus = pclose(process);
return result;
}
@@ -659,7 +670,8 @@ bool RevGitQuery::extractRevision(RevisionInformation& rev_info)
{
// This command will return without success if the working copy is
// changed, whether checked into index or not.
- rev_info.wc_modified = system("git diff --quiet HEAD");
+ runCommand("git diff --quiet HEAD");
+ rev_info.wc_modified = exitStatus != 0;
}
}
std::string tag = runCommand("git describe --exact-match --tags");
@@ -1,6 +1,7 @@
#!/bin/sh
sed -e 's/r\([0-9]\+\)/[rev]\1[\/rev]/g' \
-e 's/ticket:\([0-9]\+\)/[ticket]\1[\/ticket]/g'\
+ -e 's/commit:\(\([a-f0-9]\{10\}\)[a-f0-9]\{30\}\)/[url=http:\/\/developer.wz2100.net\/changeset\/\1]\2[\/url]/g' \
-e 's/\ \ \*/\ */g' \
-e 's/^\ \*\ \(.*\):/\n[\/list][b]\1[\/b][list]/g' \
-e 's/^\ \ \*/\ [*]/'
@@ -72,13 +72,13 @@ POLYGONS 21
200 4 19 18 17 16 102 186 98 186 98 199 102 199
200 4 22 21 20 13 57 201 50 201 50 214 57 214
200 4 25 24 12 23 50 187 57 187 57 200 50 200
- 4200 4 29 28 27 26 8 1 19 17 19 246 1 246 1 230 19 230
- 4200 4 33 32 31 30 8 1 19 17 1 215 19 215 19 231 1 231
- 4200 4 37 36 35 34 8 1 9 15 57 200 66 200 66 214 57 214
- 4200 4 41 40 39 38 8 1 9 9 9 246 9 255 0 255 0 246
+ 200 4 29 28 27 26 19 246 1 246 1 230 19 230
+ 200 4 33 32 31 30 1 215 19 215 19 231 1 231
+ 200 4 37 36 35 34 57 200 66 200 66 214 57 214
+ 200 4 41 40 39 38 9 246 9 255 0 255 0 246
200 4 42 43 44 45 130 210 139 210 139 200 130 200
200 4 45 44 43 42 130 200 139 200 139 210 130 210
- 4200 4 48 47 46 11 8 1 9 15 66 200 57 200 57 214 66 214
+ 200 4 48 47 46 11 66 200 57 200 57 214 66 214
200 4 52 51 50 49 137 197 137 186 126 186 126 197
200 4 56 55 54 53 118 186 112 186 112 197 118 197
200 4 57 56 50 51 137 186 124 186 127 190 137 190
@@ -77,13 +77,13 @@ POLYGONS 22
200 4 21 20 19 18 86 186 82 186 82 198 86 198
200 4 23 21 22 15 39 201 29 201 29 213 39 213
200 4 20 25 14 24 29 187 39 187 39 199 29 199
- 4200 4 29 28 27 26 8 1 19 17 19 246 1 246 1 230 19 230
- 4200 4 33 32 31 30 8 1 19 17 1 215 19 215 19 231 1 231
- 4200 4 37 36 35 34 8 1 9 15 57 200 66 200 66 214 57 214
- 4200 4 41 40 39 38 8 1 9 9 9 246 9 255 0 255 0 246
+ 200 4 29 28 27 26 19 246 1 246 1 230 19 230
+ 200 4 33 32 31 30 1 215 19 215 19 231 1 231
+ 200 4 37 36 35 34 57 200 66 200 66 214 57 214
+ 200 4 41 40 39 38 9 246 9 255 0 255 0 246
200 4 42 43 44 45 130 210 139 210 139 200 130 200
200 4 45 44 43 42 130 200 139 200 139 210 130 210
- 4200 4 49 48 47 46 8 1 9 15 66 200 57 200 57 214 66 214
+ 200 4 49 48 47 46 66 200 57 200 57 214 66 214
200 4 53 52 51 50 153 215 169 215 169 231 153 231
200 4 57 56 55 54 137 197 137 186 126 186 126 197
200 4 61 60 59 58 118 186 112 186 112 197 118 197
@@ -167,13 +167,13 @@ POLYGONS 22
200 4 19 18 17 16 94 186 90 186 90 198 94 198
200 4 21 19 20 13 49 201 40 201 40 213 49 213
200 4 18 23 12 22 40 187 49 187 49 199 40 199
- 4200 4 27 26 25 24 8 1 19 17 19 246 1 246 1 230 19 230
- 4200 4 31 30 29 28 8 1 19 17 1 215 19 215 19 231 1 231
- 4200 4 35 34 33 32 8 1 9 15 57 200 66 200 66 214 57 214
- 4200 4 39 38 37 36 8 1 9 9 9 246 9 255 0 255 0 246
+ 200 4 27 26 25 24 19 246 1 246 1 230 19 230
+ 200 4 31 30 29 28 1 215 19 215 19 231 1 231
+ 200 4 35 34 33 32 57 200 66 200 66 214 57 214
+ 200 4 39 38 37 36 9 246 9 255 0 255 0 246
200 4 40 41 42 43 130 210 139 210 139 200 130 200
200 4 43 42 41 40 130 200 139 200 139 210 130 210
- 4200 4 47 46 45 44 8 1 9 15 66 200 57 200 57 214 66 214
+ 200 4 47 46 45 44 66 200 57 200 57 214 66 214
200 4 51 50 49 48 153 215 169 215 169 231 153 231
200 4 55 54 53 52 137 197 137 186 126 186 126 197
200 4 59 58 57 56 118 186 112 186 112 197 118 197
@@ -259,13 +259,13 @@ POLYGONS 22
200 4 19 18 17 16 102 186 98 186 98 199 102 199
200 4 22 21 20 13 57 201 50 201 50 214 57 214
200 4 25 24 12 23 50 187 57 187 57 200 50 200
- 4200 4 29 28 27 26 8 1 19 17 19 246 1 246 1 230 19 230
- 4200 4 33 32 31 30 8 1 19 17 1 215 19 215 19 231 1 231
- 4200 4 37 36 35 34 8 1 9 15 57 200 66 200 66 214 57 214
- 4200 4 41 40 39 38 8 1 9 9 9 246 9 255 0 255 0 246
+ 200 4 29 28 27 26 19 246 1 246 1 230 19 230
+ 200 4 33 32 31 30 1 215 19 215 19 231 1 231
+ 200 4 37 36 35 34 57 200 66 200 66 214 57 214
+ 200 4 41 40 39 38 9 246 9 255 0 255 0 246
200 4 42 43 44 45 130 210 139 210 139 200 130 200
200 4 45 44 43 42 130 200 139 200 139 210 130 210
- 4200 4 49 48 47 46 8 1 9 15 66 200 57 200 57 214 66 214
+ 200 4 49 48 47 46 66 200 57 200 57 214 66 214
200 4 53 52 51 50 153 215 169 215 169 231 153 231
200 4 57 56 55 54 137 197 137 186 126 186 126 197
200 4 61 60 59 58 118 186 112 186 112 197 118 197
@@ -77,13 +77,13 @@ POLYGONS 22
200 4 19 18 17 16 102 186 98 186 98 199 102 199
200 4 22 21 20 13 57 201 50 201 50 214 57 214
200 4 25 24 12 23 50 187 57 187 57 200 50 200
- 4200 4 29 28 27 26 8 1 19 17 19 246 1 246 1 230 19 230
- 4200 4 33 32 31 30 8 1 19 17 1 215 19 215 19 231 1 231
- 4200 4 37 36 35 34 8 1 9 15 57 200 66 200 66 214 57 214
- 4200 4 41 40 39 38 8 1 9 9 9 246 9 255 0 255 0 246
+ 200 4 29 28 27 26 19 246 1 246 1 230 19 230
+ 200 4 33 32 31 30 1 215 19 215 19 231 1 231
+ 200 4 37 36 35 34 57 200 66 200 66 214 57 214
+ 200 4 41 40 39 38 9 246 9 255 0 255 0 246
200 4 42 43 44 45 130 210 139 210 139 200 130 200
200 4 45 44 43 42 130 200 139 200 139 210 130 210
- 4200 4 49 48 47 46 8 1 9 15 66 200 57 200 57 214 66 214
+ 200 4 49 48 47 46 66 200 57 200 57 214 66 214
200 4 53 52 51 50 153 215 169 215 169 231 153 231
200 4 57 56 55 54 137 197 137 186 126 186 126 197
200 4 61 60 59 58 118 186 112 186 112 197 118 197
@@ -167,13 +167,13 @@ POLYGONS 22
200 4 19 18 17 16 94 186 90 186 90 198 94 198
200 4 21 19 20 13 49 201 40 201 40 213 49 213
200 4 18 23 12 22 40 187 49 187 49 199 40 199
- 4200 4 27 26 25 24 8 1 19 17 19 246 1 246 1 230 19 230
- 4200 4 31 30 29 28 8 1 19 17 1 215 19 215 19 231 1 231
- 4200 4 35 34 33 32 8 1 9 15 57 200 66 200 66 214 57 214
- 4200 4 39 38 37 36 8 1 9 9 9 246 9 255 0 255 0 246
+ 200 4 27 26 25 24 19 246 1 246 1 230 19 230
+ 200 4 31 30 29 28 1 215 19 215 19 231 1 231
+ 200 4 35 34 33 32 57 200 66 200 66 214 57 214
+ 200 4 39 38 37 36 9 246 9 255 0 255 0 246
200 4 40 41 42 43 130 210 139 210 139 200 130 200
200 4 43 42 41 40 130 200 139 200 139 210 130 210
- 4200 4 47 46 45 44 8 1 9 15 66 200 57 200 57 214 66 214
+ 200 4 47 46 45 44 66 200 57 200 57 214 66 214
200 4 51 50 49 48 153 215 169 215 169 231 153 231
200 4 55 54 53 52 137 197 137 186 126 186 126 197
200 4 59 58 57 56 118 186 112 186 112 197 118 197
@@ -259,13 +259,13 @@ POLYGONS 22
200 4 21 20 19 18 86 186 82 186 82 198 86 198
200 4 23 21 22 15 39 201 29 201 29 213 39 213
200 4 20 25 14 24 29 187 39 187 39 199 29 199
- 4200 4 29 28 27 26 8 1 19 17 19 246 1 246 1 230 19 230
- 4200 4 33 32 31 30 8 1 19 17 1 215 19 215 19 231 1 231
- 4200 4 37 36 35 34 8 1 9 15 57 200 66 200 66 214 57 214
- 4200 4 41 40 39 38 8 1 9 9 9 246 9 255 0 255 0 246
+ 200 4 29 28 27 26 19 246 1 246 1 230 19 230
+ 200 4 33 32 31 30 1 215 19 215 19 231 1 231
+ 200 4 37 36 35 34 57 200 66 200 66 214 57 214
+ 200 4 41 40 39 38 9 246 9 255 0 255 0 246
200 4 42 43 44 45 130 210 139 210 139 200 130 200
200 4 45 44 43 42 130 200 139 200 139 210 130 210
- 4200 4 49 48 47 46 8 1 9 15 66 200 57 200 57 214 66 214
+ 200 4 49 48 47 46 66 200 57 200 57 214 66 214
200 4 53 52 51 50 153 215 169 215 169 231 153 231
200 4 57 56 55 54 137 197 137 186 126 186 126 197
200 4 61 60 59 58 118 186 112 186 112 197 118 197
Oops, something went wrong.

0 comments on commit 60d7cb6

Please sign in to comment.