|
a/ohbuild.sh |
|
b/ohbuild.sh |
|
... |
|
... |
| 171 |
ifeq ($(managed_only), yes)
|
171 |
ifeq ($(managed_only), yes)
|
| 172 |
build_targets_base = make_obj_dir ohNet.net.dll CpProxyDotNetAssemblies DvDeviceDotNetAssemblies
|
172 |
build_targets_base = make_obj_dir ohNet.net.dll CpProxyDotNetAssemblies DvDeviceDotNetAssemblies
|
| 173 |
else
|
173 |
else
|
| 174 |
EOF
|
174 |
EOF
|
| 175 |
|
175 |
|
|
|
176 |
git checkout OpenHome/TestFramework/OptionParser.cpp
|
|
|
177 |
patch -p1 << "EOF"
|
|
|
178 |
diff --git a/OpenHome/TestFramework/OptionParser.cpp b/OpenHome/TestFramework/OptionParser.cpp
|
|
|
179 |
index fe90233..644fc0b 100644
|
|
|
180 |
--- a/OpenHome/TestFramework/OptionParser.cpp
|
|
|
181 |
b/OpenHome/TestFramework/OptionParser.cpp
|
|
|
182 |
@@ -282,7 +282,7 @@ void OptionParser::SetUsage(const TChar* aUsage)
|
|
|
183 |
{
|
|
|
184 |
delete iUsage;
|
|
|
185 |
iUsage = NULL;
|
|
|
186 |
- iUsage = new TChar[strlen(iUsage)];
|
|
|
187 |
iUsage = new TChar[strlen(aUsage)];
|
|
|
188 |
(void)strcpy(iUsage, aUsage);
|
|
|
189 |
}
|
|
|
190 |
EOF
|
|
|
191 |
|
| 176 |
cd $topdir/ohNetGenerated
|
192 |
cd $topdir/ohNetGenerated
|
| 177 |
# Tue May 9 08:54:47 2017
|
193 |
# Tue May 9 08:54:47 2017
|
| 178 |
git checkout e3edb912410d4c5a4d5323bb1e9c27660a42d78f || exit 1
|
194 |
git checkout e3edb912410d4c5a4d5323bb1e9c27660a42d78f || exit 1
|
| 179 |
git checkout Makefile
|
195 |
git checkout Makefile
|
| 180 |
patch -p1 << "EOF"
|
196 |
patch -p1 << "EOF"
|
|
... |
|
... |
| 207 |
+ endif
|
223 |
+ endif
|
| 208 |
endif
|
224 |
endif
|
| 209 |
ifneq (,$(findstring i686,$(gcc_machine)))
|
225 |
ifneq (,$(findstring i686,$(gcc_machine)))
|
| 210 |
detected_openhome_architecture = x86
|
226 |
detected_openhome_architecture = x86
|
| 211 |
EOF
|
227 |
EOF
|
| 212 |
|
|
|
| 213 |
git checkout OpenHome/TestFramework/OptionParser.cpp
|
|
|
| 214 |
patch -p1 << "EOF"
|
228 |
patch -p1 << "EOF"
|
| 215 |
diff --git a/OpenHome/TestFramework/OptionParser.cpp b/OpenHome/TestFramework/OptionParser.cpp
|
229 |
diff -u ./Common.mak ../../openhome/ohNetGenerated/Common.mak
|
| 216 |
index fe90233..644fc0b 100644
|
230 |
--- ./Common.mak 2017-09-19 10:51:13.000000000 +0200
|
| 217 |
a/OpenHome/TestFramework/OptionParser.cpp
|
231 |
../../openhome/ohNetGenerated/Common.mak 2017-09-19 13:21:25.984071432 +0200
|
| 218 |
+++ b/OpenHome/TestFramework/OptionParser.cpp
|
232 |
@@ -17,20 +17,6 @@
|
| 219 |
@@ -282,7 +282,7 @@ void OptionParser::SetUsage(const TChar* aUsage)
|
233 |
$(objdir)ohnet-generated.jar : CpProxyJavaClasses DvDeviceJavaClasses
|
| 220 |
{
|
234 |
$(jar) $(jarflags) $(objdir)ohnet-generated.jar -C $(objdir) org
|
| 221 |
delete iUsage;
|
235 |
|
| 222 |
iUsage = NULL;
|
236 |
-Generated$(dirsep)GenerateSourceFiles.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/UpnpMakeT4.tt
|
| 223 |
iUsage = new TChar[strlen(iUsage)];
|
237 |
- $(mkdir) Generated
|
| 224 |
+ iUsage = new TChar[strlen(aUsage)];
|
238 |
- $(t4) -o Generated$(dirsep)GenerateSourceFiles.mak OpenHome/Net/T4/Templates/UpnpMakeT4.tt -a xml:OpenHome/Net/Service/Services.xml
|
| 225 |
(void)strcpy(iUsage, aUsage);
|
239 |
- @echo Attention: a makefile has been re-generated.
|
| 226 |
}
|
240 |
-
|
|
|
241 |
-Generated$(dirsep)Proxies.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/CpUpnpMakeProxies.tt
|
|
|
242 |
- $(mkdir) Generated
|
|
|
243 |
- $(t4) -o Generated$(dirsep)Proxies.mak OpenHome/Net/T4/Templates/CpUpnpMakeProxies.tt -a xml:OpenHome/Net/Service/Services.xml
|
|
|
244 |
- @echo Attention: a makefile has been re-generated.
|
|
|
245 |
-
|
|
|
246 |
-Generated$(dirsep)Devices.mak : $(tt) OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml OpenHome/Net/T4/Templates/DvUpnpMakeDevices.tt
|
|
|
247 |
- $(mkdir) Generated
|
|
|
248 |
- $(t4) -o Generated$(dirsep)Devices.mak OpenHome/Net/T4/Templates/DvUpnpMakeDevices.tt -a xml:OpenHome/Net/Service/Services.xml
|
|
|
249 |
- @echo Attention: a makefile has been re-generated.
|
|
|
250 |
|
|
|
251 |
native_targets = make_obj_dir copy_build_includes proxies devices
|
|
|
252 |
|
| 227 |
EOF
|
253 |
EOF
|
| 228 |
|
|
|
| 229 |
cd $topdir/ohTopology
|
254 |
cd $topdir/ohTopology
|
| 230 |
# Wed Mar 22 11:15:28 2017 +0000
|
255 |
# Wed Mar 22 11:15:28 2017 +0000
|
| 231 |
git checkout cc09c09da4be8d3d04adae5b8f0daaf8450906a3 || exit 1
|
256 |
git checkout cc09c09da4be8d3d04adae5b8f0daaf8450906a3 || exit 1
|
| 232 |
|
257 |
|
| 233 |
cd $topdir/ohSongcast
|
258 |
cd $topdir/ohSongcast
|
|
... |
|
... |
| 241 |
|
266 |
|
| 242 |
# Make space: get rid of the .git and other not useful data, then
|
267 |
# Make space: get rid of the .git and other not useful data, then
|
| 243 |
# produce a tar file for reproduction
|
268 |
# produce a tar file for reproduction
|
| 244 |
for dir in ohNet ohNetGenerated ohdevtools ohTopology ohSongcast;do
|
269 |
for dir in ohNet ohNetGenerated ohdevtools ohTopology ohSongcast;do
|
| 245 |
test -d $dir || fatal no "'$dir'" in "'$topdir'"
|
270 |
test -d $dir || fatal no "'$dir'" in "'$topdir'"
|
| 246 |
rm -rf $topdir/$dir/.git
|
|
|
| 247 |
done
|
271 |
done
|
| 248 |
rm -rf $topdir/ohNet/thirdparty
|
272 |
#rm -rf $topdir/ohNet/thirdparty
|
| 249 |
rm -rf $topdir/ohNetGenerated/OpenHome/Net/Bindings/Cs
|
273 |
rm -rf $topdir/ohNetGenerated/OpenHome/Net/Bindings/Cs
|
| 250 |
rm -rf $topdir/ohNetGenerated/OpenHome/Net/Bindings/Java
|
274 |
rm -rf $topdir/ohNetGenerated/OpenHome/Net/Bindings/Java
|
| 251 |
rm -rf $topdir/ohNetGenerated/OpenHome/Net/Bindings/Js
|
275 |
rm -rf $topdir/ohNetGenerated/OpenHome/Net/Bindings/Js
|
| 252 |
rm -rf $topdir/ohNetGenerated/OpenHome/Net/T4/
|
276 |
rm -rf $topdir/ohNetGenerated/OpenHome/Net/T4/
|
| 253 |
rm -rf $topdir/ohSongcast/Docs/
|
277 |
rm -rf $topdir/ohSongcast/Docs/
|
|
... |
|
... |
| 255 |
rm -rf $topdir/ohSongcast/ohSongcast/Windows
|
279 |
rm -rf $topdir/ohSongcast/ohSongcast/Windows
|
| 256 |
rm -rf $topdir/ohTopology/waf
|
280 |
rm -rf $topdir/ohTopology/waf
|
| 257 |
rm -rf $topdir/ohdevtools/nuget
|
281 |
rm -rf $topdir/ohdevtools/nuget
|
| 258 |
|
282 |
|
| 259 |
dt=`date +%Y%m%d`
|
283 |
dt=`date +%Y%m%d`
|
| 260 |
tar czf $tarfile/tmp/openhome-sc2-${dt}.tar.gz .
|
284 |
tar --exclude='.git' -czf $tarfile/tmp/openhome-sc2-${dt}.tar.gz .
|
| 261 |
}
|
285 |
}
|
| 262 |
|
286 |
|
| 263 |
build_ohNet()
|
287 |
build_ohNet()
|
| 264 |
{
|
288 |
{
|
| 265 |
dir=ohNet
|
289 |
dir=ohNet
|
|
... |
|
... |
| 290 |
tar xvzf $topdir/ohNet/Build/Bundles/ohNet-${arch}-${debug}.tar.gz
|
314 |
tar xvzf $topdir/ohNet/Build/Bundles/ohNet-${arch}-${debug}.tar.gz
|
| 291 |
) || exit 1
|
315 |
) || exit 1
|
| 292 |
|
316 |
|
| 293 |
|
317 |
|
| 294 |
make native_only=yes
|
318 |
make native_only=yes
|
| 295 |
|
319 |
# Expect error here, but the relevant bits have been built
|
|
|
320 |
|
| 296 |
# Copy the includes from here to the ohNet dir where ohTopology
|
321 |
# Copy the includes from here to the ohNet dir where ohTopology
|
| 297 |
# will want them
|
322 |
# will want them
|
| 298 |
tar cf - Build/Include | (cd $topdir/ohNet/;tar xvf -) || exit 1
|
323 |
tar cf - Build/Include | (cd $topdir/ohNet/;tar xvf -) || exit 1
|
| 299 |
}
|
324 |
}
|
| 300 |
|
325 |
|