Merge branch 'refs/heads/upstream-core4' into feature/separate-packag…

…e-management

nel/src/3d/driver/direct3d/driver_direct3d_pixel_program.cpp

@@ -1,7 +1,7 @@
 /** \file driver_direct3d_pixel_program.cpp
  * Direct 3d driver implementation
  *
- * $Id: driver_direct3d_pixel_program.cpp,v 1.1.2.4 2007/07/09 15:26:35 legallo Exp $
+ * $Id$
  *
  * \todo manage better the init/release system (if a throw occurs in the init, we must release correctly the driver)
  */

nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp

@@ -1,7 +1,7 @@
 /** \file driver_opengl_pixel_program.cpp
  * OpenGL driver implementation for pixel program manipulation.
  *
- * $Id: driver_opengl_pixel_program.cpp,v 1.1.2.4 2007/07/09 15:29:00 legallo Exp $
+ * $Id$
  *
  * \todo manage better the init/release system (if a throw occurs in the init, we must release correctly the driver)
  */

nel/tools/3d/build_gamedata/processes/anim/sh/export.sh

@@ -1,57 +1,57 @@
-#!/bin/bash
-rm log.log 2> /dev/null
-
-# *** Export animation files (.anim) from Max
-
-exec_timeout='exec_timeout.exe'
-
-# Get the timeout
-timeout=`cat ../../cfg/config.cfg | grep "anim_export_timeout" | sed -e 's/anim_export_timeout//' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Get the database directory
-database_directory=`cat ../../cfg/site.cfg | grep "database_directory" | sed -e 's/database_directory//g' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Get the build gamedata directory
-build_gamedata_directory=`cat ../../cfg/site.cfg | grep "build_gamedata_directory" | sed -e 's/build_gamedata_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Get the anim directories
-anim_source_directories=`cat ../../cfg/directories.cfg | grep "anim_source_directory" | sed -e 's/anim_source_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Maxdir
-max_directory=`echo $MAX_DIR | sed -e 's&\\\&/&g'`
-
-# Log error
-echo ------- > log.log
-echo --- Export animation >> log.log
-echo ------- >> log.log
-echo ------- 
-echo --- Export animation 
-echo ------- 
-date >> log.log
-date
-
-# For each directoy
-
-for i in $anim_source_directories ; do
-	# Copy the script
-	cat maxscript/anim_export.ms | sed -e "s&output_logfile&$build_gamedata_directory/processes/anim/log.log&g" | sed -e "s&anim_source_directory&$database_directory/$i&g" | sed -e "s&output_directory&$build_gamedata_directory/processes/anim/anim_export&g" > $max_directory/scripts/anim_export.ms
-
-	# Start max
-	echo Try 1 >> log.log
-	$exec_timeout $timeout $max_directory/3dsmax.exe -U MAXScript anim_export.ms -q -mi -vn
-
-	# Idle
-	../../idle.bat
-
-	echo Try 2 >> log.log
-	$exec_timeout $timeout $max_directory/3dsmax.exe -U MAXScript anim_export.ms -q -mi -vn
-
-	# Idle
-	../../idle.bat
-
-	echo Try 3 >> log.log
-	$exec_timeout $timeout $max_directory/3dsmax.exe -U MAXScript anim_export.ms -q -mi -vn
-
-	# Idle
-	../../idle.bat
-done
+#!/bin/bash
+rm log.log 2> /dev/null
+
+# *** Export animation files (.anim) from Max
+
+exec_timeout='exec_timeout.exe'
+
+# Get the timeout
+timeout=`cat ../../cfg/config.cfg | grep "anim_export_timeout" | sed -e 's/anim_export_timeout//' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Get the database directory
+database_directory=`cat ../../cfg/site.cfg | grep "database_directory" | sed -e 's/database_directory//g' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Get the build gamedata directory
+build_gamedata_directory=`cat ../../cfg/site.cfg | grep "build_gamedata_directory" | sed -e 's/build_gamedata_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Get the anim directories
+anim_source_directories=`cat ../../cfg/directories.cfg | grep "anim_source_directory" | sed -e 's/anim_source_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Maxdir
+max_directory=`echo $MAX_DIR | sed -e 's&\\\&/&g'`
+
+# Log error
+echo ------- > log.log
+echo --- Export animation >> log.log
+echo ------- >> log.log
+echo ------- 
+echo --- Export animation 
+echo ------- 
+date >> log.log
+date
+
+# For each directoy
+
+for i in $anim_source_directories ; do
+	# Copy the script
+	cat maxscript/anim_export.ms | sed -e "s&output_logfile&$build_gamedata_directory/processes/anim/log.log&g" | sed -e "s&anim_source_directory&$database_directory/$i&g" | sed -e "s&output_directory&$build_gamedata_directory/processes/anim/anim_export&g" > $max_directory/scripts/anim_export.ms
+
+	# Start max
+	echo Try 1 >> log.log
+	$exec_timeout $timeout $max_directory/3dsmax.exe -U MAXScript anim_export.ms -q -mi -vn
+
+	# Idle
+	../../idle.bat
+
+	echo Try 2 >> log.log
+	$exec_timeout $timeout $max_directory/3dsmax.exe -U MAXScript anim_export.ms -q -mi -vn
+
+	# Idle
+	../../idle.bat
+
+	echo Try 3 >> log.log
+	$exec_timeout $timeout $max_directory/3dsmax.exe -U MAXScript anim_export.ms -q -mi -vn
+
+	# Idle
+	../../idle.bat
+done

nel/tools/3d/build_gamedata/processes/anim/sh/install.sh

@@ -1,22 +1,22 @@
-#!/bin/bash
-rm log.log 2> /dev/null
-
-# Install anim in the client data
-
-# Get the anim install directory
-anim_install_directory=`cat ../../cfg/directories.cfg | grep "anim_install_directory" | sed -e 's/anim_install_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Get the client directory
-client_directory=`cat ../../cfg/site.cfg | grep "client_directory" | sed -e 's/client_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Log error
-echo ------- > log.log
-echo --- Install animation >> log.log
-echo ------- >> log.log
-echo ------- 
-echo --- Install animation 
-echo ------- 
-date >> log.log
-date
-
-cp -u -p -R anim/. $client_directory/$anim_install_directory  2>> log.log
+#!/bin/bash
+rm log.log 2> /dev/null
+
+# Install anim in the client data
+
+# Get the anim install directory
+anim_install_directory=`cat ../../cfg/directories.cfg | grep "anim_install_directory" | sed -e 's/anim_install_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Get the client directory
+client_directory=`cat ../../cfg/site.cfg | grep "client_directory" | sed -e 's/client_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Log error
+echo ------- > log.log
+echo --- Install animation >> log.log
+echo ------- >> log.log
+echo ------- 
+echo --- Install animation 
+echo ------- 
+date >> log.log
+date
+
+cp -u -p -R anim/. $client_directory/$anim_install_directory  2>> log.log

nel/tools/3d/build_gamedata/processes/clodbank/sh/build.sh

@@ -1,26 +1,26 @@
-#!/bin/bash
-rm log.log 2> /dev/null
-
-# Log error
-echo ------- > log.log
-echo --- Build clod : build .clodbank >> log.log
-echo ------- >> log.log
-echo ------- 
-echo --- Build clod : build .clodbank
-echo ------- 
-date >> log.log
-date
-
-# Get the database directory
-database_directory=`cat ../../cfg/site.cfg | grep "database_directory" | sed -e 's/database_directory//g' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Get the lod config file in the database
-clod_config_file=`cat ../../cfg/config.cfg | grep "clod_config_file" | sed -e 's/clod_config_file//' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Get the Lod character bank name
-clod_bank_file_name=`cat ../../cfg/config.cfg | grep "clod_bank_file_name" | sed -e 's/clod_bank_file_name//' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-
-# Execute the build
-build_clod_bank.exe  cfg/local_path.cfg  $database_directory/$clod_config_file  clodbank/$clod_bank_file_name
-
+#!/bin/bash
+rm log.log 2> /dev/null
+
+# Log error
+echo ------- > log.log
+echo --- Build clod : build .clodbank >> log.log
+echo ------- >> log.log
+echo ------- 
+echo --- Build clod : build .clodbank
+echo ------- 
+date >> log.log
+date
+
+# Get the database directory
+database_directory=`cat ../../cfg/site.cfg | grep "database_directory" | sed -e 's/database_directory//g' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Get the lod config file in the database
+clod_config_file=`cat ../../cfg/config.cfg | grep "clod_config_file" | sed -e 's/clod_config_file//' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Get the Lod character bank name
+clod_bank_file_name=`cat ../../cfg/config.cfg | grep "clod_bank_file_name" | sed -e 's/clod_bank_file_name//' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+
+# Execute the build
+build_clod_bank.exe  cfg/local_path.cfg  $database_directory/$clod_config_file  clodbank/$clod_bank_file_name
+

nel/tools/3d/build_gamedata/processes/clodbank/sh/export.sh

@@ -1,60 +1,60 @@
-#!/bin/bash
-rm log.log 2> /dev/null
-
-
-# *** Export character lod shape files (.clod) from Max
-
-exec_timeout='exec_timeout.exe'
-
-# Get the timeout
-timeout=`cat ../../cfg/config.cfg | grep "shape_export_timeout" | sed -e 's/shape_export_timeout//' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Get the database directory
-database_directory=`cat ../../cfg/site.cfg | grep "database_directory" | sed -e 's/database_directory//g' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Get the build gamedata directory
-build_gamedata_directory=`cat ../../cfg/site.cfg | grep "build_gamedata_directory" | sed -e 's/build_gamedata_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Get the shape directories
-clod_source_directories=`cat ../../cfg/directories.cfg | grep "clod_source_directory" | sed -e 's/clod_source_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Maxdir
-max_directory=`echo $MAX_DIR | sed -e 's&\\\&/&g'`
-
-# Log error
-echo ------- > log.log
-echo --- Export clod >> log.log
-echo ------- >> log.log
-echo ------- 
-echo --- Export clod
-echo ------- 
-date >> log.log
-date
-
-# For each directoy
-
-for i in $clod_source_directories ; do
-	# Copy the script
-	cat maxscript/clod_export.ms | sed -e "s&output_logfile&$build_gamedata_directory/processes/clodbank/log.log&g" | sed -e "s&shape_source_directory&$database_directory/$i&g" | sed -e "s&output_directory_clod&$build_gamedata_directory/processes/clodbank/clod&g" | sed -e "s&output_directory_tag&$build_gamedata_directory/processes/clodbank/tag&g" > $max_directory/scripts/clod_export.ms
-
-	# Start max
-	echo Try 1 >> log.log
-	$exec_timeout $timeout $max_directory/3dsmax.exe -U MAXScript clod_export.ms -q -mi -vn
-
-	# Idle
-	../../idle.bat
-
-	echo Try 2 >> log.log
-	$exec_timeout $timeout $max_directory/3dsmax.exe -U MAXScript clod_export.ms -q -mi -vn
-
-	# Idle
-	../../idle.bat
-
-	echo Try 3 >> log.log
-	$exec_timeout $timeout $max_directory/3dsmax.exe -U MAXScript clod_export.ms -q -mi -vn
-
-	# Idle
-	../../idle.bat
-done
-
-
+#!/bin/bash
+rm log.log 2> /dev/null
+
+
+# *** Export character lod shape files (.clod) from Max
+
+exec_timeout='exec_timeout.exe'
+
+# Get the timeout
+timeout=`cat ../../cfg/config.cfg | grep "shape_export_timeout" | sed -e 's/shape_export_timeout//' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Get the database directory
+database_directory=`cat ../../cfg/site.cfg | grep "database_directory" | sed -e 's/database_directory//g' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Get the build gamedata directory
+build_gamedata_directory=`cat ../../cfg/site.cfg | grep "build_gamedata_directory" | sed -e 's/build_gamedata_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Get the shape directories
+clod_source_directories=`cat ../../cfg/directories.cfg | grep "clod_source_directory" | sed -e 's/clod_source_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Maxdir
+max_directory=`echo $MAX_DIR | sed -e 's&\\\&/&g'`
+
+# Log error
+echo ------- > log.log
+echo --- Export clod >> log.log
+echo ------- >> log.log
+echo ------- 
+echo --- Export clod
+echo ------- 
+date >> log.log
+date
+
+# For each directoy
+
+for i in $clod_source_directories ; do
+	# Copy the script
+	cat maxscript/clod_export.ms | sed -e "s&output_logfile&$build_gamedata_directory/processes/clodbank/log.log&g" | sed -e "s&shape_source_directory&$database_directory/$i&g" | sed -e "s&output_directory_clod&$build_gamedata_directory/processes/clodbank/clod&g" | sed -e "s&output_directory_tag&$build_gamedata_directory/processes/clodbank/tag&g" > $max_directory/scripts/clod_export.ms
+
+	# Start max
+	echo Try 1 >> log.log
+	$exec_timeout $timeout $max_directory/3dsmax.exe -U MAXScript clod_export.ms -q -mi -vn
+
+	# Idle
+	../../idle.bat
+
+	echo Try 2 >> log.log
+	$exec_timeout $timeout $max_directory/3dsmax.exe -U MAXScript clod_export.ms -q -mi -vn
+
+	# Idle
+	../../idle.bat
+
+	echo Try 3 >> log.log
+	$exec_timeout $timeout $max_directory/3dsmax.exe -U MAXScript clod_export.ms -q -mi -vn
+
+	# Idle
+	../../idle.bat
+done
+
+

nel/tools/3d/build_gamedata/processes/clodbank/sh/install.sh

@@ -1,22 +1,22 @@
-#!/bin/bash
-rm log.log 2> /dev/null
-
-# Install clodbank in the client data, in the "shapes/" directory
-
-# Get the shape install directory
-shape_install_directory=`cat ../../cfg/directories.cfg | grep "shape_install_directory" | sed -e 's/shape_install_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Get the client directory
-client_directory=`cat ../../cfg/site.cfg | grep "client_directory" | sed -e 's/client_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
-
-# Log error
-echo ------- > log.log
-echo --- Install clodbank >> log.log
-echo ------- >> log.log
-echo ------- 
-echo --- Install clodbank 
-echo ------- 
-date >> log.log
-date
-
-cp -u -p -R clodbank/. $client_directory/$shape_install_directory  2>> log.log
+#!/bin/bash
+rm log.log 2> /dev/null
+
+# Install clodbank in the client data, in the "shapes/" directory
+
+# Get the shape install directory
+shape_install_directory=`cat ../../cfg/directories.cfg | grep "shape_install_directory" | sed -e 's/shape_install_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Get the client directory
+client_directory=`cat ../../cfg/site.cfg | grep "client_directory" | sed -e 's/client_directory//' | sed -e 's/ //g' | sed -e 's/=//g'`
+
+# Log error
+echo ------- > log.log
+echo --- Install clodbank >> log.log
+echo ------- >> log.log
+echo ------- 
+echo --- Install clodbank 
+echo ------- 
+date >> log.log
+date
+
+cp -u -p -R clodbank/. $client_directory/$shape_install_directory  2>> log.log