Skip to content

Commit c4cd447

Browse files
committed
Updated offline docs
1 parent e93be48 commit c4cd447

File tree

6 files changed

+19
-16
lines changed

6 files changed

+19
-16
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ build/linux/dist/*.tar.bz2
3737
build/linux/*.tgz
3838
build/linux/*.zip
3939
build/linux/libastylej*
40+
build/shared/reference*.zip
4041
test-bin
4142
*.iml
4243
.idea

app/src/processing/app/Base.java

+10-14
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ static protected void initRequirements() {
186186
try {
187187
Class.forName("com.sun.jdi.VirtualMachine");
188188
} catch (ClassNotFoundException cnfe) {
189-
showPlatforms();
190189
showError(_("Please install JDK 1.5 or later"),
191190
_("Arduino requires a full JDK (not just a JRE)\n" +
192191
"to run. Please install JDK 1.5 or later.\n" +
@@ -1901,43 +1900,40 @@ static public void registerWindowCloseKeys(JRootPane root,
19011900

19021901

19031902
static public void showReference(String filename) {
1904-
File referenceFolder = getContentFile("reference");
1903+
File referenceFolder = getContentFile("reference/arduino.cc/en");
19051904
File referenceFile = new File(referenceFolder, filename);
1905+
if (!referenceFile.exists())
1906+
referenceFile = new File(referenceFolder, filename + ".html");
19061907
openURL(referenceFile.getAbsolutePath());
19071908
}
19081909

19091910
static public void showGettingStarted() {
19101911
if (OSUtils.isMacOS()) {
1911-
showReference(_("Guide_MacOSX.html"));
1912+
showReference("Guide/MacOSX");
19121913
} else if (OSUtils.isWindows()) {
1913-
showReference(_("Guide_Windows.html"));
1914+
showReference("Guide/Windows");
19141915
} else {
1915-
openURL(_("http://www.arduino.cc/playground/Learning/Linux"));
1916+
openURL("http://www.arduino.cc/playground/Learning/Linux");
19161917
}
19171918
}
19181919

19191920
static public void showReference() {
1920-
showReference(_("index.html"));
1921+
showReference("Reference/HomePage");
19211922
}
19221923

19231924

19241925
static public void showEnvironment() {
1925-
showReference(_("Guide_Environment.html"));
1926-
}
1927-
1928-
1929-
static public void showPlatforms() {
1930-
showReference(_("environment") + File.separator + _("platforms.html"));
1926+
showReference("Guide/Environment");
19311927
}
19321928

19331929

19341930
static public void showTroubleshooting() {
1935-
showReference(_("Guide_Troubleshooting.html"));
1931+
showReference("Guide/Troubleshooting");
19361932
}
19371933

19381934

19391935
static public void showFAQ() {
1940-
showReference(_("FAQ.html"));
1936+
showReference("Main/FAQ");
19411937
}
19421938

19431939

app/src/processing/app/Editor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1881,7 +1881,7 @@ protected void handleFindReference() {
18811881
if (referenceFile == null) {
18821882
statusNotice(I18n.format(_("No reference available for \"{0}\""), text));
18831883
} else {
1884-
Base.showReference(I18n.format(_("{0}.html"), referenceFile));
1884+
Base.showReference("Reference/" + referenceFile);
18851885
}
18861886
}
18871887

build/build.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,12 @@
143143
</copy>
144144

145145
<!-- Unzip documentation -->
146-
<unzip dest="${target.path}" src="shared/reference.zip" overwrite="false"/>
146+
<antcall target="unzip">
147+
<param name="archive_file" value="shared/reference-1.6.0.zip" />
148+
<param name="archive_url" value="http://arduino.cc/download.php?f=/reference-1.6.0.zip" />
149+
<param name="final_folder" value="${target.path}/reference" />
150+
<param name="dest_folder" value="${target.path}" />
151+
</antcall>
147152

148153
<!-- Write the revision file! -->
149154
<echo file="${target.path}/lib/version.txt" message="${version}" />

build/shared/reference-1.6.0.zip.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
61699592ab44df789b98527f2d82e8defc8ce552

build/shared/reference.zip

-727 KB
Binary file not shown.

0 commit comments

Comments
 (0)