Skip to content

Commit 179720e

Browse files
Split off hardware folder copying in build.xml
This shouldn't change anything except a bit of ordering, but prepares for the next commit.
1 parent 60ca108 commit 179720e

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

build/build.xml

+14-13
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,21 @@
101101
<!-- - - - - - - - - -->
102102
<!-- Basic Assembly -->
103103
<!-- - - - - - - - - -->
104+
<target name="copy-hardware">
105+
<!-- copy hardware folder -->
106+
<copy todir="${target.path}/hardware">
107+
<fileset dir="../hardware">
108+
<exclude name="arduino/sam/system/CMSIS/Device/ATMEL/*/svd/"/>
109+
<exclude name="arduino/sam/system/CMSIS/Device/ATMEL/*/html/"/>
110+
<exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/ARM/*M0*"/>
111+
<exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/ARM/*M4*"/>
112+
<exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/GCC/*M0*"/>
113+
<exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/GCC/*M4*"/>
114+
</fileset>
115+
</copy>
116+
</target>
104117

105-
<target name="assemble">
118+
<target name="assemble" depends="copy-hardware">
106119
<fail unless="target.path"
107120
message="Do not call assemble from the command line." />
108121

@@ -116,18 +129,6 @@
116129
<fileset dir="../libraries" />
117130
</copy>
118131

119-
<!-- copy hardware folder -->
120-
<copy todir="${target.path}/hardware">
121-
<fileset dir="../hardware">
122-
<exclude name="arduino/sam/system/CMSIS/Device/ATMEL/*/svd/"/>
123-
<exclude name="arduino/sam/system/CMSIS/Device/ATMEL/*/html/"/>
124-
<exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/ARM/*M0*"/>
125-
<exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/ARM/*M4*"/>
126-
<exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/GCC/*M0*"/>
127-
<exclude name="arduino/sam/system/CMSIS/CMSIS/Lib/GCC/*M4*"/>
128-
</fileset>
129-
</copy>
130-
131132
<!-- copy shared examples folder -->
132133
<copy todir="${target.path}/examples">
133134
<fileset dir="shared/examples" />

0 commit comments

Comments
 (0)