Issue 2 move folders and use deep path include file names to prevent collisions (#4)

* moving folders and files and adjust server demo build

* Fix Makefile for apps/server on Linux

* fix unit test source file folders

* fix datetime convert UTC functions. Add Code::Blocks project for datetime testing

* added some ignore extensions

* disable parallel make option

* fix build for abort, dcc, and epics apps

* fix build for dcc, epics, error, and getevent apps.

* Fixed building of all apps

* fix the ipv4 to ipv6 router app build

* Change indent style from Google to Webkit

* make pretty to re-format style

* removed common Makefile since we already had one and two was too many

* remove scripts from root folder that are no longer maintained or used

* remove mercurial EOL and ignore files for git repo

* remove .vscodeconfig files from repo

* tweak clang-format style

* clang-format src and apps with tweaked style

* added clang-tidy to fix readability if braces in src

* result of make tidy for src and apps

* fix clang-tidy mangling

* Added code::blocks project for BACnet server simulation

* added code::blocks linux project for WhoIs app

* update text files for EOL

* fix EOL in some files

* fixed make win32 apps for older gcc

* Removed Borland C++ Makefile in apps. Unable to maintain support for Borland C++ compiler.

* created codeblocks project for apps/epics for Windows

* fixing ports/xplained to work with new data structure.

* fix ports/xplained example for Atmel Studio compile

* fix ports/stm32f10x example for gcc Makefile compile

* fix ports/stm32f10x example for IAR EWARM compile

* fix ports/xplained timer callback

* fix ports/bdk_atxx_mspt build with subdirs

* fix ports/bdk_atxx_mspt build with subdirs

* updated git ignore for IAR build artifacts

* updated gitignore for non-tracked files and folders

* fixed bdk-atxx4-mstp port for Rowley Crossworks project file

* fixed bdk-atxx4-mstp port for GCC AVR Makefile

* fixed atmega168 port for IAR AVR and GCC AVR Makefile

* fixed at91sam7s port for IAR ARM and GCC ARM Makefile

* removed unmaintainable DOS, RTOS32, and atmega8 ports.  Updated rx62n (untested).

* changed arm7 to uip port
This commit is contained in:
Steve Karg
2019-12-13 15:19:10 -06:00
committed by GitHub
parent 8a38dbe2cf
commit d50c190957
912 changed files with 36206 additions and 52502 deletions
+77 -57
View File
@@ -11,7 +11,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
<version>29</version>
<version>31</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -66,7 +66,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
<state>8.11.2.13604</state>
<state>8.32.3.20186</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -112,11 +112,11 @@
</option>
<option>
<name>RTConfigPath2</name>
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
<state>$TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h</state>
</option>
<option>
<name>GBECoreSlave</name>
<version>25</version>
<version>27</version>
<state>38</state>
</option>
<option>
@@ -133,7 +133,7 @@
</option>
<option>
<name>CoreVariant</name>
<version>25</version>
<version>27</version>
<state>38</state>
</option>
<option>
@@ -156,7 +156,7 @@
</option>
<option>
<name>GFPUCoreSlave2</name>
<version>25</version>
<version>27</version>
<state>38</state>
</option>
<option>
@@ -200,13 +200,22 @@
<name>DSPExtension</name>
<state>0</state>
</option>
<option>
<name>TrustZone</name>
<state>0</state>
</option>
<option>
<name>TrustZoneModes</name>
<version>0</version>
<state>0</state>
</option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
<version>34</version>
<version>35</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -353,8 +362,7 @@
<option>
<name>CCIncludePath2</name>
<state>$PROJ_DIR$</state>
<state>$PROJ_DIR$\..\..\include</state>
<state>$PROJ_DIR$\..\..\demo\object</state>
<state>$PROJ_DIR$\..\..\src</state>
<state>$PROJ_DIR$\CMSIS\</state>
<state>$PROJ_DIR$\drivers\inc</state>
</option>
@@ -470,6 +478,10 @@
<name>IccRTTI2</name>
<state>0</state>
</option>
<option>
<name>OICompilerExtraOption</name>
<state>1</state>
</option>
</data>
</settings>
<settings>
@@ -690,7 +702,7 @@
<name>ILINK</name>
<archiveVersion>0</archiveVersion>
<data>
<version>20</version>
<version>22</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -1002,6 +1014,14 @@
<name>IlinkLocaleSelect</name>
<state>1</state>
</option>
<option>
<name>IlinkTrustzoneImportLibraryOut</name>
<state>###Unitialized###</state>
</option>
<option>
<name>OILinkExtraOption</name>
<state>1</state>
</option>
</data>
</settings>
<settings>
@@ -1034,118 +1054,121 @@
<group>
<name>BACnet</name>
<file>
<name>$PROJ_DIR$\..\..\src\abort.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\abort.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\apdu.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\bacaddr.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\bacaddr.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\bacapp.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\bacapp.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\bacdcode.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\bacdcode.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\bacerror.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\bacerror.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\bacint.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\bacint.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\bacreal.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\bacreal.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\bacstr.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\bacstr.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\datalink\crc.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\crc.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\dcc.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\dcc.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\fifo.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\fifo.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\iam.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\iam.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\ihave.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\ihave.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\memcopy.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\memcopy.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\npdu.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\npdu.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\proplist.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\proplist.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\rd.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\rd.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\reject.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\reject.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\rp.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\ringbuf.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\rpm.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\rp.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\whohas.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\rpm.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\whois.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\whohas.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\whois.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\wp.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\wp.c</name>
</file>
</group>
<group>
<name>BACnet-Handlers</name>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\h_dcc.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\service\h_apdu.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\h_npdu.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\service\h_dcc.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\h_rd.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\service\h_noserv.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\h_rp.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\npdu\h_npdu.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\h_rpm.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\service\h_rd.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\h_whohas.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\service\h_rp.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\h_whois.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\service\h_rpm.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\h_wp.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\service\h_whohas.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\noserv.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\service\h_whois.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\s_iam.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\service\h_wp.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\s_ihave.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\mstimer.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\demo\handler\txbuf.c</name>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\sys\ringbuf.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\service\s_iam.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\service\s_ihave.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\src\bacnet\basic\tsm\tsm.c</name>
</file>
</group>
<group>
@@ -1247,6 +1270,9 @@
<file>
<name>$PROJ_DIR$\main.c</name>
</file>
<file>
<name>$PROJ_DIR$\mstimer-init.c</name>
</file>
<file>
<name>$PROJ_DIR$\rs485.c</name>
</file>
@@ -1256,10 +1282,4 @@
<file>
<name>$PROJ_DIR$\system_stm32f10x.c</name>
</file>
<file>
<name>$PROJ_DIR$\timer.c</name>
</file>
<file>
<name>$PROJ_DIR$\timer_sys.c</name>
</file>
</project>