@@ -49,30 +49,32 @@ public class Library extends LocalContribution {
49
49
50
50
/**
51
51
* Filter to pull out just files and none of the platform-specific
52
- * directories, and to skip export.txt. As of 2.0a2, other directories are
53
- * included, because we need things like the 'plugins' subfolder w/ video.
52
+ * directories, and to skip export.txt.
53
+ *
54
+ * As of 2.0a2, other directories are included, because we need
55
+ * things like the 'plugins' subfolder w/ video.
56
+ *
57
+ * As of 4.0b4, only checking whether macos, windows, linux, or
58
+ * android are the prefix of the folder name, so that we can avoid
59
+ * explicitly listing all possible architectures, and so that
60
+ * macos-blah as well as and macosx will be handled properly.
54
61
*/
55
62
static FilenameFilter standardFilter = new FilenameFilter () {
56
63
public boolean accept (File dir , String name ) {
57
64
// skip .DS_Store files, .svn folders, etc
58
65
if (name .charAt (0 ) == '.' ) return false ;
66
+ // ha, the sftp library still has one [fry 220121]
59
67
if (name .equals ("CVS" )) return false ;
60
68
if (name .equals ("export.txt" )) return false ;
69
+
61
70
File file = new File (dir , name );
62
- // return (!file.isDirectory());
63
71
if (file .isDirectory ()) {
64
- if (name .equals ("macosx" )) return false ;
65
- if (name .equals ("macosx32" )) return false ;
66
- if (name .equals ("macosx64" )) return false ;
67
- if (name .equals ("windows" )) return false ;
68
- if (name .equals ("windows32" )) return false ;
69
- if (name .equals ("windows64" )) return false ;
70
- if (name .equals ("linux" )) return false ;
71
- if (name .equals ("linux32" )) return false ;
72
- if (name .equals ("linux64" )) return false ;
73
- if (name .equals ("linux-armv6hf" )) return false ;
74
- if (name .equals ("linux-arm64" )) return false ;
75
- if (name .equals ("android" )) return false ;
72
+ if (name .startsWith ("macos" ) ||
73
+ name .startsWith ("windows" ) ||
74
+ name .startsWith ("linux" ) ||
75
+ name .startsWith ("android" )) {
76
+ return false ;
77
+ }
76
78
}
77
79
return true ;
78
80
}
0 commit comments