From 39f2a09aee8886244bffdfe38827419c0fdc34d7 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 3 May 2013 17:18:03 -0700
Subject: [PATCH] Update installer files

---
 .../PortableInstaller.vcxproj                 | 68 ++++++-------------
 .../PortableInstaller.vcxproj.filters         | 68 ++++++-------------
 .../win_installer/fragment_automation.iss     | 31 +++++----
 3 files changed, 54 insertions(+), 113 deletions(-)

diff --git a/aegisub/build/PortableInstaller/PortableInstaller.vcxproj b/aegisub/build/PortableInstaller/PortableInstaller.vcxproj
index 962ad7df7..60c2b0ae9 100644
--- a/aegisub/build/PortableInstaller/PortableInstaller.vcxproj
+++ b/aegisub/build/PortableInstaller/PortableInstaller.vcxproj
@@ -65,7 +65,7 @@
     <RarContents Include="$(AegisubSourceBase)automation\autoload\macro-2-mkfullwitdh.lua">
       <OutputPath>automation\autoload\</OutputPath>
     </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\autoload\select-overlaps.lua">
+    <RarContents Include="$(AegisubSourceBase)automation\autoload\select-overlaps.moon">
       <OutputPath>automation\autoload\</OutputPath>
     </RarContents>
     <RarContents Include="$(AegisubSourceBase)automation\autoload\strip-tags.lua">
@@ -77,6 +77,18 @@
     <RarContents Include="$(AegisubSourceBase)automation\demos\raytracer.lua">
       <OutputPath>automation\demos\</OutputPath>
     </RarContents>
+    <RarContents Include="$(AegisubSourceBase)automation\include\aegisub\clipboard.lua">
+      <OutputPath>automation\include\aegisub\</OutputPath>
+    </RarContents>
+    <RarContents Include="$(AegisubSourceBase)automation\include\aegisub\re.moon">
+      <OutputPath>automation\include\aegisub\</OutputPath>
+    </RarContents>
+    <RarContents Include="$(AegisubSourceBase)automation\include\aegisub\unicode.moon">
+      <OutputPath>automation\include\aegisub\</OutputPath>
+    </RarContents>
+    <RarContents Include="$(AegisubSourceBase)automation\include\aegisub\util.moon">
+      <OutputPath>automation\include\aegisub\</OutputPath>
+    </RarContents>
     <RarContents Include="$(AegisubSourceBase)automation\include\cleantags.lua">
       <OutputPath>automation\include\</OutputPath>
     </RarContents>
@@ -89,9 +101,15 @@
     <RarContents Include="$(AegisubSourceBase)automation\include\karaskel.lua">
       <OutputPath>automation\include\</OutputPath>
     </RarContents>
+    <RarContents Include="$(AegisubSourceBase)automation\include\moonscript.lua">
+      <OutputPath>automation\include\</OutputPath>
+    </RarContents>
     <RarContents Include="$(AegisubSourceBase)automation\include\re.lua">
       <OutputPath>automation\include\</OutputPath>
     </RarContents>
+    <RarContents Include="$(AegisubSourceBase)automation\include\underscore.moon">
+      <OutputPath>automation\include\</OutputPath>
+    </RarContents>
     <RarContents Include="$(AegisubSourceBase)automation\include\unicode.lua">
       <OutputPath>automation\include\</OutputPath>
     </RarContents>
@@ -101,54 +119,6 @@
     <RarContents Include="$(AegisubSourceBase)automation\include\utils.lua">
       <OutputPath>automation\include\</OutputPath>
     </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\appended-lines.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\basic-export-test.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\basic-tests.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\config-dialog-test.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\gen-absurd-t-line.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\hello-world.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\karaoke-parse-test.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\progress-reporting-test.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\selection-set-test.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\test-filter-name-clash.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\test-furi.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\test-tablecopy-recursive.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\test-text_extents.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\text-extents-test.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\trace-level-test.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\unicode-test.lua">
-      <OutputPath>automation\tests\</OutputPath>
-    </RarContents>
     <RarContents Include="$(AegisubSourceBase)bin\AssDraw3.chm" />
     <RarContents Include="$(AegisubSourceBase)bin\AssDraw3.exe" />
     <RarContents Include="$(AegisubSourceBase)bin\DirectShowSource.dll" Condition="'$(AegisubUseAvisynth)' == 'true'" />
diff --git a/aegisub/build/PortableInstaller/PortableInstaller.vcxproj.filters b/aegisub/build/PortableInstaller/PortableInstaller.vcxproj.filters
index d48a560b0..4bbaab8fb 100644
--- a/aegisub/build/PortableInstaller/PortableInstaller.vcxproj.filters
+++ b/aegisub/build/PortableInstaller/PortableInstaller.vcxproj.filters
@@ -52,7 +52,7 @@
     <RarContents Include="$(AegisubSourceBase)automation\autoload\macro-2-mkfullwitdh.lua">
       <Filter>Automation\Autoload</Filter>
     </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\autoload\select-overlaps.lua">
+    <RarContents Include="$(AegisubSourceBase)automation\autoload\select-overlaps.moon">
       <Filter>Automation\Autoload</Filter>
     </RarContents>
     <RarContents Include="$(AegisubSourceBase)automation\autoload\strip-tags.lua">
@@ -64,6 +64,18 @@
     <RarContents Include="$(AegisubSourceBase)automation\demos\raytracer.lua">
       <Filter>Automation\Demos</Filter>
     </RarContents>
+    <RarContents Include="$(AegisubSourceBase)automation\include\aegisub\clipboard.lua">
+      <Filter>Automation\Include</Filter>
+    </RarContents>
+    <RarContents Include="$(AegisubSourceBase)automation\include\aegisub\re.moon">
+      <Filter>Automation\Include</Filter>
+    </RarContents>
+    <RarContents Include="$(AegisubSourceBase)automation\include\aegisub\unicode.moon">
+      <Filter>Automation\Include</Filter>
+    </RarContents>
+    <RarContents Include="$(AegisubSourceBase)automation\include\aegisub\util.moon">
+      <Filter>Automation\Include</Filter>
+    </RarContents>
     <RarContents Include="$(AegisubSourceBase)automation\include\cleantags.lua">
       <Filter>Automation\Include</Filter>
     </RarContents>
@@ -76,9 +88,15 @@
     <RarContents Include="$(AegisubSourceBase)automation\include\karaskel.lua">
       <Filter>Automation\Include</Filter>
     </RarContents>
+    <RarContents Include="$(AegisubSourceBase)automation\include\moonscript.lua">
+      <Filter>Automation\Include</Filter>
+    </RarContents>
     <RarContents Include="$(AegisubSourceBase)automation\include\re.lua">
       <Filter>Automation\Include</Filter>
     </RarContents>
+    <RarContents Include="$(AegisubSourceBase)automation\include\underscore.moon">
+      <Filter>Automation\Include</Filter>
+    </RarContents>
     <RarContents Include="$(AegisubSourceBase)automation\include\unicode.lua">
       <Filter>Automation\Include</Filter>
     </RarContents>
@@ -88,54 +106,6 @@
     <RarContents Include="$(AegisubSourceBase)automation\include\utils.lua">
       <Filter>Automation\Include</Filter>
     </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\appended-lines.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\basic-export-test.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\basic-tests.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\config-dialog-test.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\gen-absurd-t-line.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\hello-world.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\karaoke-parse-test.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\progress-reporting-test.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\selection-set-test.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\test-filter-name-clash.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\test-furi.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\test-tablecopy-recursive.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\test-text_extents.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\text-extents-test.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\trace-level-test.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
-    <RarContents Include="$(AegisubSourceBase)automation\tests\unicode-test.lua">
-      <Filter>Automation\Tests</Filter>
-    </RarContents>
     <RarContents Include="$(AegisubSourceBase)bin\aegisub$(AegisubPlatformSuffix).exe" />
     <RarContents Include="$(AegisubSourceBase)bin\ffms2_$(AegisubPlatformSuffix).dll" />
     <RarContents Include="$(AegisubSourceBase)packages\win_installer\portable\config.json" />
diff --git a/aegisub/packages/win_installer/fragment_automation.iss b/aegisub/packages/win_installer/fragment_automation.iss
index beed985a6..49e80d21b 100644
--- a/aegisub/packages/win_installer/fragment_automation.iss
+++ b/aegisub/packages/win_installer/fragment_automation.iss
@@ -32,29 +32,30 @@
 ; Contact: mailto:nielsm@indvikleren.dk
 ;
 
-
 ; This file declares all installables related to Aegisub Automation
 
 [Files]
-; auto4 main
-DestDir: {app}\automation\include; Source: ..\..\automation\include\cleantags.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\clipboard.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\karaskel-auto4.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\karaskel.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\re.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\unicode.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\utils-auto4.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\include; Source: ..\..\automation\include\utils.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-
-; Sample macros
+DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\clean-info.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
 DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\cleantags-autoload.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
 DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\kara-templater.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
 DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\karaoke-auto-leadin.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
 DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\macro-1-edgeblur.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
 DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\macro-2-mkfullwitdh.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\select-overlaps.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\select-overlaps.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
 DestDir: {app}\automation\autoload; Source: ..\..\automation\autoload\strip-tags.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
 DestDir: {app}\automation\demos; Source: ..\..\automation\demos\future-windy-blur.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-DestDir: {app}\automation\demos; Source: ..\..\automation\demos\raytracer-test1.ass; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
 DestDir: {app}\automation\demos; Source: ..\..\automation\demos\raytracer.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
-
+DestDir: {app}\automation\include\aegisub; Source: ..\..\automation\include\aegisub\clipboard.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include\aegisub; Source: ..\..\automation\include\aegisub\re.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include\aegisub; Source: ..\..\automation\include\aegisub\unicode.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include\aegisub; Source: ..\..\automation\include\aegisub\util.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\cleantags.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\clipboard.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\karaskel-auto4.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\karaskel.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\moonscript.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\re.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\underscore.moon; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\unicode.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\utils-auto4.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly
+DestDir: {app}\automation\include; Source: ..\..\automation\include\utils.lua; Flags: ignoreversion overwritereadonly uninsremovereadonly; Attribs: readonly