Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

[conf] rename from *.xml.example to *_example.xml

Browse Source 
- select_conf: personal conf file is conf_personal.xml
This commit is contained in:
Felix Ruess
2013-09-13 23:56:14 +02:00
parent b2b114c689
commit 80a007f155
9 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -40,6 +40,7 @@
# /conf/ # /conf/
/conf/conf.xml /conf/conf.xml
/conf/conf.xml.20* /conf/conf.xml.20*
/conf/conf_personal.xml.20*
/conf/control_panel.xml /conf/control_panel.xml
/conf/%gconf.xml /conf/%gconf.xml
/conf/maps_data/* /conf/maps_data/*
Makefile
+2 -2
View File
@@ -113,7 +113,7 @@ update_google_version:
conf: conf/conf.xml conf/control_panel.xml conf/maps.xml conf: conf/conf.xml conf/control_panel.xml conf/maps.xml
conf/%.xml :conf/%.xml.example conf/%.xml :conf/%_example.xml
[ -L $@ ] || [ -f $@ ] || cp $< $@ [ -L $@ ] || [ -f $@ ] || cp $< $@
@@ -294,7 +294,7 @@ ab_clean:
replace_current_conf_xml: replace_current_conf_xml:
test conf/conf.xml && mv conf/conf.xml conf/conf.xml.backup.$(BUILD_DATETIME) test conf/conf.xml && mv conf/conf.xml conf/conf.xml.backup.$(BUILD_DATETIME)
cp conf/tests_conf.xml conf/conf.xml cp conf/conf_tests.xml conf/conf.xml
restore_conf_xml: restore_conf_xml:
test conf/conf.xml.backup.$(BUILD_DATETIME) && mv conf/conf.xml.backup.$(BUILD_DATETIME) conf/conf.xml test conf/conf.xml.backup.$(BUILD_DATETIME) && mv conf/conf.xml.backup.$(BUILD_DATETIME) conf/conf.xml
conf/conf.xml.example → conf/conf_example.xml
View File
conf/tests_conf.xml → conf/conf_tests.xml
View File
conf/conf.xml.tri → conf/conf_tri.xml
View File
conf/control_panel.xml.example → conf/control_panel_example.xml
View File
conf/maps.xml.example → conf/maps_example.xml
View File
select_conf.py
+3 -3
View File
@@ -52,8 +52,8 @@ class ConfChooser:
conf_files = [] conf_files = []
pattern = "*conf.xml*" pattern = "conf[._-]*xml*"
backup_pattern = "conf.xml.*2[0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]_*" backup_pattern = "conf[._-]*xml.20[0-9][0-9]-[01][0-9]-[0-3][0-9]_*"
excludes = ["%gconf.xml"] excludes = ["%gconf.xml"]
for path, subdirs, files in os.walk(self.conf_dir): for path, subdirs, files in os.walk(self.conf_dir):
@@ -147,7 +147,7 @@ class ConfChooser:
self.paparazzi_home = os.getenv("PAPARAZZI_HOME", os.path.dirname(os.path.abspath(__file__))) self.paparazzi_home = os.getenv("PAPARAZZI_HOME", os.path.dirname(os.path.abspath(__file__)))
self.conf_dir = os.path.join(self.paparazzi_home, "conf") self.conf_dir = os.path.join(self.paparazzi_home, "conf")
self.conf_xml = os.path.join(self.conf_dir, "conf.xml") self.conf_xml = os.path.join(self.conf_dir, "conf.xml")
self.conf_personal_name = "conf.xml.personal" self.conf_personal_name = "conf_personal.xml"
self.conf_personal = os.path.join(self.conf_dir, self.conf_personal_name) self.conf_personal = os.path.join(self.conf_dir, self.conf_personal_name)
self.exclude_backups = True self.exclude_backups = True
tests/examples/01_compile_all_test_targets.t
+1 -1
View File
@@ -8,7 +8,7 @@ use Data::Dumper;
use Config; use Config;
$|++; $|++;
my $examples = XMLin("$ENV{'PAPARAZZI_SRC'}/conf/tests_conf.xml"); my $examples = XMLin("$ENV{'PAPARAZZI_SRC'}/conf/conf_tests.xml");
use Data::Dumper; use Data::Dumper;