diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2010-06-17 14:17:44 +0200 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2010-06-17 14:17:44 +0200 |
| commit | 4cec20510d41d9a6b9239143beb9987f58a25008 (patch) | |
| tree | 2b72ed9a48c2617f671aef13c60c0f135fbc0062 | |
| parent | a68a360a8b61f03a8329f1134d797535264d1188 (diff) | |
gen-makefile-am.sh: make file order deterministiclibsynthesis_3.4.0.6+syncevolution-1-0-1pohly
"find" reports files in a filesystem dependent order. Added "sort"
to get deterministic results. Found while diffing source distribution
archives (bugs.meego.com #2586).
| -rwxr-xr-x | src/gen-makefile-am.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/gen-makefile-am.sh b/src/gen-makefile-am.sh index da20f68..41a337a 100755 --- a/src/gen-makefile-am.sh +++ b/src/gen-makefile-am.sh @@ -70,7 +70,8 @@ LIBSYNTHESIS_SOURCES=`find ${ENGINE_SOURCES} \ syncapps/serverEngine_custom \ sysync_SDK/DB_Interfaces/text_db \ \( -name '*.cpp' -o -name '*.[ch]' \) | - grep -v -E -f EXCLUDE_FILES` + grep -v -E -f EXCLUDE_FILES | + sort` LIBSYNTHESIS_SOURCES=`echo $LIBSYNTHESIS_SOURCES` # files to be included in both libsynthesis and libsynthesissdk; @@ -79,7 +80,8 @@ LIBSYNTHESIS_SOURCES=`echo $LIBSYNTHESIS_SOURCES` cat SERVER_FILES CLIENT_FILES EXTRA_FILES > EXCLUDE_FILES LIBSYNTHESISSDK_SOURCES_BOTH=`find sysync_SDK/Sources \ \( -name '*.cpp' -o -name '*.c' \) | - grep -v -E -f EXCLUDE_FILES` + grep -v -E -f EXCLUDE_FILES | + sort` LIBSYNTHESISSDK_SOURCES_BOTH=`echo $LIBSYNTHESISSDK_SOURCES_BOTH` # files only needed in libsynthesissdk @@ -87,19 +89,21 @@ cat SERVER_FILES CLIENT_FILES EXTRA_FILES > EXCLUDE_FILES LIBSYNTHESISSDK_SOURCES_ONLY=`find sysync_SDK/Sources \ \( -name '*.cpp' -o -name '*.c' \) | grep -E -f SDK_FILES | - grep -v -E -f EXCLUDE_FILES` + grep -v -E -f EXCLUDE_FILES | + sort` LIBSYNTHESISSDK_SOURCES_ONLY=`echo $LIBSYNTHESISSDK_SOURCES_ONLY` # files needed in libsmltk LIBSMLTK_SOURCES=`find syncml_tk \ \( -name '*.cpp' -o -name '*.[ch]' \) \ \! \( -path syncml_tk/src/sml/\*/palm/\* -o \ - -path syncml_tk/src/sml/\*/win/\* \)` + -path syncml_tk/src/sml/\*/win/\* \) | + sort` LIBSMLTK_SOURCES=`echo $LIBSMLTK_SOURCES` # header files required for using libsynthesissdk, # with "synthesis/" prefix -LIBSYNTHESISSDK_HEADERS=`find sysync_SDK/Sources -name '*.h' | sed -e 's;.*/;synthesis/;'` +LIBSYNTHESISSDK_HEADERS=`find sysync_SDK/Sources -name '*.h' | sed -e 's;.*/;synthesis/;' | sort` LIBSYNTHESISSDK_HEADERS=`echo $LIBSYNTHESISSDK_HEADERS` sed -e "s;@LIBSYNTHESIS_SOURCES@;$LIBSYNTHESIS_SOURCES;" \ |