Permalink
Browse files

Rename shared/ to external/ and sharedLib to zoteroLib

Place Mendeley's original code in src/ with a LICENSE.txt with copyright Mendeley.

Rename tests/ to testFiles/

Rename environment variable to MENDELEY_OO_TEST_FILES and don't expect the path there to end with a forward slash.
  • Loading branch information...
1 parent 88b01dc commit 3b1ac70bf0af1b249246ed1aff575fa07c7ad522 @SteveRidout SteveRidout committed Dec 6, 2011
@@ -5,5 +5,5 @@
<library:element library:name="mendeleyLib"/>
<library:element library:name="mendeleyDataTypes"/>
<library:element library:name="mendeleyUnitTests"/>
- <library:element library:name="sharedLib"/>
+ <library:element library:name="zoteroLib"/>
</library:library>
View
@@ -28,7 +28,7 @@ and generated a bibliography automatically.
## Running unit tests:
1. Build and install the .oxt file using the steps above
- 2. Set the environment variable `MENDELEY_OO_TEST_PATH` to the full path of the `tests/` directory
+ 2. Set the environment variable `MENDELEY_OO_TEST_FILES` to the full path of the `testFiles/` directory
3. Copy the `tests/testDatabase@test.com@local.sqlite` file into your Mendeley data directory (see http://www.mendeley.com/faq/#locate-database).
4. Run Mendeley Desktop with options `--account testDatabase@test.com --server local`
5. Run OpenOffice Writer and select Tools->Macros->Run Macro...
View
@@ -82,11 +82,11 @@
print "OpenOffice Plugin Version: $PLUGIN_VERSION\n";
-processSourceFile("mendeleyMain.vb", "mendeleyMain-OpenOffice.vb", "Mendeley");
-processSourceFile("mendeleyLib.vb", "mendeleyLib-OpenOffice.vb", "MendeleyLib");
-processSourceFile("mendeleyDataTypes.vb", "mendeleyDataTypes-OpenOffice.vb", "MendeleyDataTypes");
-processSourceFile("mendeleyUnitTests.vb", "mendeleyUnitTests-OpenOffice.vb", "MendeleyUnitTests");
-processSourceFile("shared/sharedLib.vb", "sharedLib-OpenOffice.vb", "SharedLib");
+processSourceFile("src/mendeleyMain.vb", "mendeleyMain-OpenOffice.vb", "Mendeley");
+processSourceFile("src/mendeleyLib.vb", "mendeleyLib-OpenOffice.vb", "MendeleyLib");
+processSourceFile("src/mendeleyDataTypes.vb", "mendeleyDataTypes-OpenOffice.vb", "MendeleyDataTypes");
+processSourceFile("src/mendeleyUnitTests.vb", "mendeleyUnitTests-OpenOffice.vb", "MendeleyUnitTests");
+processSourceFile("external/zoteroLib.vb", "zoteroLib-OpenOffice.vb", "ZoteroLib");
# create OpenOffice mendeleyPlugin.oxt
# (which is actually a zip archive)
@@ -99,7 +99,7 @@
or die "copy failed: $!";
copy("temp/mendeleyUnitTests-OpenOffice.vb", "Mendeley/mendeleyUnitTests.xba")
or die "copy failed: $!";
-copy("temp/sharedLib-OpenOffice.vb", "Mendeley/sharedLib.xba")
+copy("temp/zoteroLib-OpenOffice.vb", "Mendeley/zoteroLib.xba")
or die "copy failed: $!";
# TODO: refactor the copy commands into a function or use the Perl ones
File renamed without changes.
File renamed without changes.
View
@@ -0,0 +1,68 @@
+
+-------------------------------------------------------------------------------
+
+Copyright (c) 2009 Mendeley Ltd.
+
+Licensed under the Educational Community License, Version 1.0 (the "License");
+you may not use the Mendeley OpenOffice plugin source code except in compliance
+with the License.
+You may obtain a copy of the License at
+
+http://www.opensource.org/licenses/ecl1.php
+
+--------------------------------------------------------------------------------
+
+THE EDUCATIONAL COMMUNITY LICENSE 1.0
+
+This Educational Community License (the "License") applies
+to any original work of authorship (the "Original Work") whose owner
+(the "Licensor") has placed the following notice immediately following
+the copyright notice for the Original Work:
+
+Copyright (c) <year> <copyright holders>
+
+Licensed under the Educational Community License version 1.0
+
+This Original Work, including software, source code, documents,
+or other related items, is being provided by the copyright holder(s)
+subject to the terms of the Educational Community License. By
+obtaining, using and/or copying this Original Work, you agree that you
+have read, understand, and will comply with the following terms and
+conditions of the Educational Community License:
+
+Permission to use, copy, modify, merge, publish, distribute, and
+sublicense this Original Work and its documentation, with or without
+modification, for any purpose, and without fee or royalty to the
+copyright holder(s) is hereby granted, provided that you include the
+following on ALL copies of the Original Work or portions thereof,
+including modifications or derivatives, that you make:
+
+
+The full text of the Educational Community License in a location viewable to
+users of the redistributed or derivative work.
+
+
+Any pre-existing intellectual property disclaimers, notices, or terms and
+conditions.
+
+
+Notice of any changes or modifications to the Original Work, including the
+date the changes were made.
+
+
+Any modifications of the Original Work must be distributed in such a manner as
+to avoid any confusion with the Original Work of the copyright holders.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+The name and trademarks of copyright holder(s) may NOT be used
+in advertising or publicity pertaining to the Original or Derivative
+Works without specific, written prior permission. Title to copyright in
+the Original Work and any associated documentation will at all times
+remain with the copyright holders.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -23,7 +23,7 @@ Option Explicit
Function testsPath() As String
' Read path from environment variable
- testsPath = Environ("MENDELEY_OO_TEST_PATH")
+ testsPath = Environ("MENDELEY_OO_TEST_FILES")
If testsPath = "" Then
MsgBox "Please ensure the MENDELEY_OO_TEST_PATH environment variable is set to " & Chr(13) &_
"the directory containing your *.odt test files before running the tests."
@@ -162,14 +162,14 @@ Sub testRefreshDocument()
' search for all .docx files
Dim filename
- filename = Dir(testsPath & "*.odt")
+ filename = Dir(testsPath() & "/*.odt")
Do While filename <> ""
documentName = Left(filename, Len(filename) - Len(".odt"))
outputDocumentName = "refreshDocument/" & documentName
Dim url
- url = ConvertToUrl(testsPath & documentName & ".odt")
+ url = ConvertToUrl(testsPath & "/" & documentName & ".odt")
Dim noArgs() 'An empty array for the arguments
Dim doc
doc = StarDesktop.LoadComponentFromUrl(url, "_blank", 0, Array())

0 comments on commit 3b1ac70

Please sign in to comment.