Skip to content

Commit 7aee51c

Browse files
committed
Cross-platform support (for #17)
1 parent f44ac8e commit 7aee51c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+596
-315
lines changed

LICENSE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
The following license applies to all of `VBA Sync Tool.exe` except these
2-
statically-linked third-party libraries:
1+
The following license applies to all of `VBASync.exe` and `VBASync.WPF.dll`
2+
except these statically-linked third-party libraries:
33

44
* DiffPlex (modified by me for use with VBA)
55
* OpenMCDF

LICENSE.rtf

Lines changed: 47 additions & 43 deletions
Large diffs are not rendered by default.

MakeInstaller.iss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#define MyAppName "VBA Sync Tool"
2-
#define MyAppVersion "1.3.1"
2+
#define MyAppVersion "2.0.0"
33
#define MyAppPublisher "Chelsea Hughes"
44
#define MyAppURL "https://github.com/chelh/VBASync"
5-
#define MyAppExeName "VBA Sync Tool.exe"
5+
#define MyAppExeName "VBASync.exe"
66

77
[Setup]
88
AppId={{FCE92422-DABC-447E-8DC4-504C206D2784}
@@ -27,7 +27,8 @@ Name: "en"; MessagesFile: "compiler:Default.isl"
2727
Name: "fr"; MessagesFile: "compiler:Languages\French.isl"
2828

2929
[Files]
30-
Source: "src\VBASync\bin\Release\VBA Sync Tool.exe"; DestDir: "{app}"; Flags: ignoreversion
30+
Source: "src\VBASync\bin\Release\VBASync.exe"; DestDir: "{app}"; Flags: ignoreversion
31+
Source: "src\VBASync.WPF\bin\Release\VBASync.WPF.dll"; DestDir: "{app}"; Flags: ignoreversion
3132
Source: "src\VBACompressionCodec.dll"; DestDir: "{app}"; Flags: ignoreversion
3233
Source: "LICENSE.rtf"; DestDir: "{app}"; Flags: ignoreversion
3334
Source: "3RDPARTY\*"; DestDir: "{app}\3RDPARTY"; Flags: ignoreversion

MakePortable.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set version=1.3.1
1+
set version=2.0.0
22
set pathTo7Zip=%ProgramFiles%\7-Zip\
33

4-
"%pathTo7Zip%7z.exe" a "dist\Portable VBA Sync Tool %version%.zip" "3RDPARTY\*" "LICENSE.rtf" ".\src\VBACompressionCodec.dll" ".\src\VBASync\bin\Release\VBA Sync Tool.exe" ".\src\VBASync.ini"
4+
"%pathTo7Zip%7z.exe" a "dist\Portable VBA Sync Tool %version%.zip" "3RDPARTY\*" "LICENSE.rtf" ".\src\VBACompressionCodec.dll" ".\src\VBASync\bin\Release\VBASync.exe" ".\src\VBASync.WPF\bin\Release\VBASync.WPF.dll" ".\src\VBASync.ini"

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ the VBA code. This gives it several advantages:
2727
as any other module.
2828
* Supports Excel 97-2003, Excel 2007+, Word 97-2003, Word 2007+,
2929
PowerPoint 2007+, and Outlook files.
30+
* Compatible with every platform supported by the .Net Framework.
3031

3132
## Using
3233
VBA Sync Tool has two modes: **Extract** mode extracts modules
@@ -56,11 +57,11 @@ You can also specify settings on the command-line via switches:
5657

5758
Switch | Meaning
5859
------ | ------
59-
`/X` | Extract VBA from Office file (default)
60-
`/P` | Publish VBA to Office file
61-
`/F <file>` | Specify Office file
62-
`/D <dir>` | Specify version-control directory
63-
`/R` | Do the selected action, then immediately exit
60+
`-x` | Extract VBA from Office file (default)
61+
`-p` | Publish VBA to Office file
62+
`-f <file>` | Specify Office file
63+
`-d <dir>` | Specify version-control directory
64+
`-r` | Do the selected action, then immediately exit
6465

6566
Any other parameter passed to VBA Sync Tool will be read and parsed as a session `.ini` file.
6667

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:l10n="clr-namespace:VBASync.Localization"
6+
xmlns:l10n="clr-namespace:VBASync.Localization;assembly=VBASync"
77
xmlns:local="clr-namespace:VBASync.WPF"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
Title="{x:Static l10n:VBASyncResources.AWTitle}"
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ public ModuleTypeToIconConverter() : base(
4646
(v, t, p, c) => {
4747
switch ((ModuleType)v) {
4848
case ModuleType.Class:
49-
return "pack://application:,,,/WPF/Icons/ClassIcon.png";
49+
return "Icons/ClassIcon.png";
5050
case ModuleType.Standard:
51-
return "pack://application:,,,/WPF/Icons/ModuleIcon.png";
51+
return "Icons/ModuleIcon.png";
5252
case ModuleType.Form:
53-
return "pack://application:,,,/WPF/Icons/FormIcon.png";
53+
return "Icons/FormIcon.png";
5454
case ModuleType.Ini:
55-
return "pack://application:,,,/WPF/Icons/ProjectIcon.png";
55+
return "Icons/ProjectIcon.png";
5656
default:
57-
return "pack://application:,,,/WPF/Icons/DocIcon.png";
57+
return "Icons/DocIcon.png";
5858
}
5959
}) {
6060
}

src/VBASync.WPF/FodyWeavers.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Weavers>
3+
<Costura IncludeDebugSymbols="false">
4+
<ExcludeAssemblies>
5+
ICSharpCode.SharpZipLib
6+
OpenMcdf
7+
VbaCompressionCodec
8+
VBASync
9+
</ExcludeAssemblies>
10+
</Costura>
11+
</Weavers>

0 commit comments

Comments
 (0)