From: Thomas Pérennou (Viveris Technologie) <thomas.perennou@external.thalesgroup.com>
Date: Tue, 24 Jun 2014 15:08:20 +0000 (+0200)
Subject: Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_tpe_852_debian_7.5
X-Git-Tag: debian_7.5_20141208~71^2~2
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=b125069fda01d43e1be59d7d45f626d33edb9cd4;hp=d1ee12eaabe23328cbb845f2c74e4e5e90b4f6b6;p=debian6500.git

Merge tag 'LIV_TRC6500_V2.2.4' into dev_tr65_tpe_852_debian_7.5

FT863 + minor generation script corrections

Conflicts:
	.gitignore
---

diff --git a/.gitignore b/.gitignore
index ec19bdf..b20d04c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,21 +8,12 @@ prod_rhp*
 *.pyc
 *.o
 *.os
+.*project
+.settings
 
-# QtCreator
-lgcore6500.*
-
-# Java build directories
-dev/common/java/*/bin
-dev/common/java/*/build
-dev/common/java/*/generated
-dev/cots/java/*/bin
-dev/cots/java/*/build
-dev/cots/java/*/generated
-dev/tools/valid_rzo/bin
-dev/tools/valid_rzo/build
-dev/tools/valid_rzo/generated
-
+#####################################################################
+# MyCCM generated code
+#####################################################################
 dev/*mccm_generated
 dev/modele/implementation/trc6500_chaine_*/*/gcc_debian_tao
 dev/modele/implementation/trc6500_chaine_*/*/mccm_generated
@@ -34,13 +25,23 @@ dev/modele/implementation/trc6500_testu/trc6500_simu_soi/*/mccm_generated
 dev/modele/implementation_bouchon/trc6500_chaine_*/*/gcc_debian_tao
 dev/modele/implementation_bouchon/trc6500_chaine_*/*/mccm_generated
 
-#symbolic links
+#####################################################################
+# Business code symlinks
+#####################################################################
 dev/code_metier/monitoring/cfg/*.xml
 dev/code_metier/serveur_iqrec/filt_dec_inc/*.h
 
 dev/common/libfe306/inc
 dev/common/libfe306/src
 
+dev/code_metier/libHwCtrl/env_exe/Bitstream/application.out
+dev/code_metier/libHwCtrl/env_exe/Bitstream/firmware.out
+dev/code_metier/libHwCtrl/env_exe/Bitstream/production.bin.v2.06
+dev/code_metier/libHwCtrl/env_exe/Bitstream/ts11_fp_pano.bin.v2.20
+dev/code_metier/libHwCtrl/env_exe/Bitstream/ts12_fp_pano.bin.v2.20
+dev/code_metier/libHwCtrl/env_exe/Bitstream/ts21_fp_pano.bin.v2.07
+dev/code_metier/libHwCtrl/env_exe/Bitstream/ts22_fp_pano.bin.v2.07
+
 dev/tools/conversions/bin2sig/src/erreur.c
 dev/tools/conversions/bin2sig/src/file_118.c
 dev/tools/conversions/bin2sig/src/outils.c