Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make ant build the first-time smoother - Fix #365 #366

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions HowToBuild
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ E.g., on my computer 'local.properties' consists of 2 lines:
sdk.dir=/Users/geometer/android-sdk-mac_86
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
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).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import java.util.*;

import org.fbreader.util.NaturalOrderComparator;
import group.pals.android.lib.ui.filechooser.utils.NaturalOrderComparator;
import org.fbreader.util.Pair;

import org.geometerplus.zlibrary.core.filesystem.ZLFile;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import android.annotation.TargetApi;
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> {
private static final NaturalOrderComparator ourComparator = new NaturalOrderComparator();
Expand Down
2 changes: 1 addition & 1 deletion third-party/AmbilWarna/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ android.library=true
# Indicates whether an apk should be generated for each density.
split.density=false
# Project target.
target=android-11
target=android-19
2 changes: 1 addition & 1 deletion third-party/android-filechooser/code/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
# project structure.

# Project target.
target=android-14
target=android-19
android.library=true
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import java.util.Comparator;

import org.fbreader.util.NaturalOrderComparator;
//import org.fbreader.util.NaturalOrderComparator;

/**
* {@link IFile} comparator.<br>
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion third-party/drag-sort-listview/library/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

android.library=true
# Project target.
target=android-5
target=android-19