yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

Minor change to make the Ant build more smooth when building for the first time

Browse source 
Updated HowToBuild accordingly
This commit is contained in:
Gordon 2015-11-08 19:58:51 -05:00
parent a62f697fb4
commit 9ccce4e8ff
9 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
HowToBuild
View file

@ -20,6 +20,13 @@ E.g., on my computer 'local.properties' consists of 2 lines:
sdk.dir=/Users/geometer/android-sdk-mac_86 sdk.dir=/Users/geometer/android-sdk-mac_86
ndk.dir=/Users/geometer/android-ndk-r4b ndk.dir=/Users/geometer/android-ndk-r4b
The same file shall be copied to following four folders as well:
cp local.properties third-party/SuperToasts/
cp local.properties third-party/android-filechooser/code/
cp local.properties third-party/drag-sort-listview/library/
cp local.properties third-party/AmbilWarna/
2. If you use Linux or MacOS, just run 'ant package' and go to step 3. For debugging 2. If you use Linux or MacOS, just run 'ant package' and go to step 3. For debugging
purposes, you might want to run 'ant dbg' for building the package in debug mode, signing purposes, you might want to run 'ant dbg' for building the package in debug mode, signing
with your debug key (in this case, you can skip step 3). with your debug key (in this case, you can skip step 3).

2
fbreader/app/src/main/java/org/geometerplus/fbreader/library/FileTree.java
View file

@ -21,7 +21,7 @@ package org.geometerplus.fbreader.library;
import java.util.*; import java.util.*;
import org.fbreader.util.NaturalOrderComparator; import group.pals.android.lib.ui.filechooser.utils.NaturalOrderComparator;
import org.fbreader.util.Pair; import org.fbreader.util.Pair;
import org.geometerplus.zlibrary.core.filesystem.ZLFile; import org.geometerplus.zlibrary.core.filesystem.ZLFile;

2
fbreader/app/src/main/java/org/geometerplus/fbreader/sort/TitledEntity.java
View file

@ -26,7 +26,7 @@ import java.util.Map;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.os.Build; import android.os.Build;
import org.fbreader.util.NaturalOrderComparator; import group.pals.android.lib.ui.filechooser.utils.NaturalOrderComparator;
public abstract class TitledEntity<T extends TitledEntity<T>> implements Comparable<T> { public abstract class TitledEntity<T extends TitledEntity<T>> implements Comparable<T> {
private static final NaturalOrderComparator ourComparator = new NaturalOrderComparator(); private static final NaturalOrderComparator ourComparator = new NaturalOrderComparator();

2
third-party/AmbilWarna/project.properties vendored
View file

@ -11,4 +11,4 @@ android.library=true
# Indicates whether an apk should be generated for each density. # Indicates whether an apk should be generated for each density.
split.density=false split.density=false
# Project target. # Project target.
target=android-11 target=android-19

2
third-party/android-filechooser/code/project.properties vendored
View file

@ -8,5 +8,5 @@
# project structure. # project structure.
# Project target. # Project target.
target=android-14 target=android-19
android.library=true android.library=true

2
third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/FileComparator.java vendored
View file

@ -13,7 +13,7 @@ import group.pals.android.lib.ui.filechooser.services.IFileProvider;
import java.util.Comparator; import java.util.Comparator;
import org.fbreader.util.NaturalOrderComparator; //import org.fbreader.util.NaturalOrderComparator;
/** /**
* {@link IFile} comparator.<br> * {@link IFile} comparator.<br>

2
fbreader/app/src/main/java/org/fbreader/util/NaturalOrderComparator.java → third-party/android-filechooser/code/src/group/pals/android/lib/ui/filechooser/utils/NaturalOrderComparator.java vendored
View file

@ -1,4 +1,4 @@
package org.fbreader.util; package group.pals.android.lib.ui.filechooser.utils;
/* /*
NaturalOrderComparator.java -- Perform 'natural order' comparisons of strings in Java. NaturalOrderComparator.java -- Perform 'natural order' comparisons of strings in Java.

BIN
third-party/drag-sort-listview/library/libs/android-support-v4.jar vendored Normal file
View file

Binary file not shown.

2
third-party/drag-sort-listview/library/project.properties vendored
View file

@ -12,4 +12,4 @@
android.library=true android.library=true
# Project target. # Project target.
target=android-5 target=android-19