improved auto-documentation's script

.travis.yml

@@ -12,7 +12,7 @@ compiler:
   - clang
 
 env:
-  - GCC_VERSION="5"
+  - GCC_VERSION="6"
   - GCC_VERSION="native"
   - LLVM_VERSION="3.7"
   - LLVM_VERSION="native"
@@ -24,7 +24,7 @@ matrix:
     - compiler: gcc
       env: LLVM_VERSION="native"
     - compiler: clang
-      env: GCC_VERSION="5"
+      env: GCC_VERSION="6"
     - compiler: clang
       env: GCC_VERSION="native"
     - os: linux
@@ -35,7 +35,9 @@ matrix:
     - os: osx
       compiler: clang
       env: LLVM_VERSION="3.7" # missing compiler by brew
-  #allow_failures:
+  allow_failures:
+    - os: linux
+      env: LLVM_VERSION="3.7" # "APT mirror was temporary switched off ..."
   #  - os: osx
 
 git:

data/glest_game

@@ -1 +1 @@
-Subproject commit a1e6be21823b1c597129e3c81f4301177c32fba7
+Subproject commit c0c270c5e0ae3c419c9b451abe71d5ab5f29a63e

mk/linux/.gitignore

@@ -6,6 +6,7 @@
 
 core
 core.bak
+core.1
 
 /build/
 /release/

mk/linux/start_megaglest

@@ -304,7 +304,7 @@ if [ "$OperatingMode" = "--game" ]; then
 		export VLC_PLUGIN_PATH="${GAMEDIR}/${LIBDIR}/vlc"
 	fi
     fi
-    "$GAMEDIR/$EXC_BINARY" $@
+    "$GAMEDIR/$EXC_BINARY" "$@"
     ExitStatus="$?"
 
     BinaryToCheck="$EXC_BINARY"

mk/linux/start_megaglest_g3dviewer

@@ -17,5 +17,5 @@ if [ -d "$GAMEDIR/$LIBDIR" ]; then
     export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${GAMEDIR}/${LIBDIR}"
 fi
 BeginTime="$(date +"%s")"
-"$GAMEDIR/$EXC_BINARY" $@
+"$GAMEDIR/$EXC_BINARY" "$@"
 "$GAMEDIR/$BASIC_SCRIPT" --tool-buginfo "$?" "$WARNINGS" "$BeginTime" "$(date +"%s")" "$EXC_BINARY"

mk/linux/start_megaglest_mapeditor

@@ -17,5 +17,5 @@ if [ -d "$GAMEDIR/$LIBDIR" ]; then
     export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${GAMEDIR}/${LIBDIR}"
 fi
 BeginTime="$(date +"%s")"
-"$GAMEDIR/$EXC_BINARY" $@
+"$GAMEDIR/$EXC_BINARY" "$@"
 "$GAMEDIR/$BASIC_SCRIPT" --tool-buginfo "$?" "$WARNINGS" "$BeginTime" "$(date +"%s")" "$EXC_BINARY"

source/tools/convert_faction_xml2html/convert_faction_xml2html.pl

@@ -1158,13 +1158,13 @@ foreach my $faction_path ( @factions ) {
 			$found = 0;
 
 			if ( $relation =~ /Require/i ) {
-				$full_tmp = "<TR><TD>$unit_pretty is a $relation for:</TD><TD>";
+				$full_tmp = "<TR><TD>'$unit_pretty' is a $relation for:</TD><TD>";
 			}
 			elsif ( $relation =~ /Command/i ) {
-				$full_tmp = "<TR><TD>$unit_pretty enables commands:</TD><TD>";
+				$full_tmp = "<TR><TD>'$unit_pretty' enables commands:</TD><TD>";
 			}
 			else {
-				$full_tmp = "<TR><TD>$unit_pretty is able to $relation:</TD><TD>";
+				$full_tmp = "<TR><TD>'$unit_pretty' is able to $relation:</TD><TD>";
 			}
 	
 			my $last_command="";
@@ -1176,7 +1176,7 @@ foreach my $faction_path ( @factions ) {
 				if ( $command ) {
 					$full_tmp .= &format_name($command)." : ".&link_unit($faction, $req_unit)."<br>\n";
 					if ( $command ne $last_command ) {
-						$req_overview_tmp .= "Enables command <i>".&format_name($command)."</i> for: ";
+						$req_overview_tmp .= "Enables command '<i>".&format_name($command)."</i>' for: ";
 					}
 					$req_overview_tmp .= &link_unit($faction, $req_unit).", ";
 					$last_command=$command;
@@ -1192,20 +1192,25 @@ foreach my $faction_path ( @factions ) {
 			if ( $found ) {
 				print "found enables for $u\n";
 				$full .= $full_tmp;
-				chop $req_overview_tmp;
-				chop $req_overview_tmp;
-				$req_overview_tmp = "<TD>$req_overview_tmp";
+				# detect unit & command in one cell
+				my $found_unit_command = grep /<A HREF=.*Enables command/, $req_overview_tmp;
+				if ( !$found_unit_command ) {
+					$req_overview_tmp = "<TD>$req_overview_tmp";
+				}
 			}
 
 		}
-
+		if ( defined $req_overview_tmp && length $req_overview_tmp ) {
+			chop $req_overview_tmp;
+			chop $req_overview_tmp;
+		}
 		$req_overview_tmp = $req_overview_tmp || "<TD>&nbsp;";
 
 
 
 		# print what's needed to build this unit and what is enabled to built by this unit
 		$found = 0;
-		$full_tmp = "<TR><TD>Needed to build $unit_pretty:</TD><TD>";
+		$full_tmp = "<TR><TD>Needed to build '$unit_pretty':</TD><TD>";
 		foreach my $unit_requirement ( @{$c_unit_requires{"$faction:$unit"}} ) {
 			my ( $faction, $req_unit ) = split(/:/, $unit_requirement );
 			my $req_unit_pretty = &format_name( $req_unit );
@@ -2361,7 +2366,7 @@ sub show_attack {
 	my $target;
 
 
-	my $full_attack_tmp = "<TR><TD>Attack Command: $command_pretty".&html_icon_command( $c, 32 )."</TD><TD>\n";
+	my $full_attack_tmp = "<TR><TD>Attack Command: $command_pretty<BR>".&html_icon_command( $c, 32 )."</TD><TD>\n";
 
 	my $skill = $attack_skill{ $c };
 	# attacks have own move_skills (charge)

source/tools/convert_faction_xml2html/media/style.css

@@ -37,6 +37,10 @@ body {
     margin: 0 auto;
     background: url("wood_panel.jpg") repeat;
 }
+img {
+    padding-right: 3px;
+    padding-bottom: 1px;
+}
 
 /* Article (core text of the page) */
 #article {

source/tools/convert_faction_xml2html/megapack.ini

@@ -208,9 +208,9 @@ This page was generated by: VAR_CREATED_BY
 	<div id="footer_left"></div>
 	<div id="footer_right"></div>
 	<ul>
-		<li><a href="/privacy.html">Privacy</a></li>
-		<li><a href="/license.html"><img src="https://megaglest.org/uploads/megaglest2011/logo/gpl_osi.png" alt="GNU GPL and OSI logos" /></a></li>
-		<li><a href="/credits.html">Credits</a></li>
+		<li><a href="https://megaglest.org/privacy.html">Privacy</a></li>
+		<li><a href="https://megaglest.org/license.html"><img src="https://megaglest.org/uploads/megaglest2011/logo/gpl_osi.png" alt="GNU GPL and OSI logos" /></a></li>
+		<li><a href="https://megaglest.org/credits.html">Credits</a></li>
 	</ul>
 </div>
 </body>