Opened 21 months ago

Closed 21 months ago

#13291 closed Patch - Bug Fix (Fixed)

android build loses new files

Reported by: Peter Bennett Owned by: Mark Spieth
Priority: minor Milestone: 30.0
Component: Ports - Android Version: Master Head
Severity: medium Keywords:
Cc: Ticket locked: no

Description

As part of a new development for android, I need to create some additional source files, which I add to the source directories and the .pro files. I have not yet added them to git.

The android/mythbuild.sh "cheap mans shadow build" deletes the links for the new files because they are not yet in git.

There is a line of code that I assume is intended to remove from the shadow build all products of regular linux builds that may be left over. In the process it is removing my new files. It is also for unknown reasons leaving behind any product from prior builds with "src" in the name, as follows:

external/FFmpeg/libavfilter/asrc_anoisesrc.d
external/FFmpeg/libavfilter/asrc_anoisesrc.o
external/FFmpeg/libavfilter/asrc_anullsrc.d
external/FFmpeg/libavfilter/asrc_anullsrc.o
external/FFmpeg/libavfilter/asrc_hilbert.d
external/FFmpeg/libavfilter/asrc_hilbert.o
external/FFmpeg/libavfilter/asrc_sine.d
external/FFmpeg/libavfilter/asrc_sine.o
external/FFmpeg/libavfilter/buffersrc.d
external/FFmpeg/libavfilter/buffersrc.o
external/FFmpeg/libavfilter/src_movie.d
external/FFmpeg/libavfilter/src_movie.o
external/FFmpeg/libavfilter/vsrc_cellauto.d
external/FFmpeg/libavfilter/vsrc_cellauto.o
external/FFmpeg/libavfilter/vsrc_life.d
external/FFmpeg/libavfilter/vsrc_life.o
external/FFmpeg/libavfilter/vsrc_mandelbrot.d
external/FFmpeg/libavfilter/vsrc_mandelbrot.o
external/FFmpeg/libavfilter/vsrc_mptestsrc.d
external/FFmpeg/libavfilter/vsrc_mptestsrc.o
external/FFmpeg/libavfilter/vsrc_testsrc.d
external/FFmpeg/libavfilter/vsrc_testsrc.o
external/libsamplerate/obj/src_linear.o
external/libsamplerate/obj/src_sinc.o
external/libsamplerate/obj/src_zoh.o
src

Proposed change will remove git ignored files only:

-git -C $MYMYTHPATH ls-files -o | grep -vE "kdev4|user|src" | xargs -n1 rm
+git -C $MYMYTHPATH status --ignored --porcelain | grep '!!' | sed 's/!!//' | xargs -n1 rm -fr

Is there any purpose behind the grep -vE "kdev4|user|src" ?

Change History (2)

comment:1 Changed 21 months ago by mspieth

cant remember but I wanted to clear all links to certain build files that distclean did not remove so that the main tree was not overwritten during build. kdev4 is for kdevelop project dir. the other 2 for similar reasons but Im tending not to edit in that tree, only in the master git tree which I have stgit overlayed for patches. All patches are refed before doing another android build.

When I add files I use stacked git which means they are in git already so don't have this problem. But Im not sure how this would affect things with the new ffmpeg structure. I expect its no different.

As for cleaning, check the mythtv and mythplugins directories so that these are cleaned correctly (version file especially is hard to remove using other methods). These are the important ones.

If clean doesnt work, there is always pristine mode which blows the build tree away and gets it again.

Otherwise if it works, it looks ok to m. commit and well see.

Last edited 21 months ago by mspieth (previous) (diff)

comment:2 Changed 21 months ago by Peter Bennett

Resolution: Fixed
Status: newclosed
Note: See TracTickets for help on using tickets.