Browse Source

More Cleanups

- Remove seperate hscommon submodule, and use the files in the dupeguru submodule
- Update package.py and build.py to account for hscommon submodule removal
- Fix one more warning in UI code
- Update .gitignore to ignore visual studio code folder
master
Andrew Senetar 4 months ago
parent
commit
caac8df893
No known key found for this signature in database GPG Key ID: FEB896EB6CF6254B
  1. 2
      .gitignore
  2. 3
      .gitmodules
  3. 2
      build.py
  4. 2
      cocoalib/HSErrorReportWindow.m
  5. 1
      hscommon
  6. 7
      package.py

2
.gitignore

@ -13,6 +13,8 @@ __pycache__
/cocoa/*.lproj/*.strings
!/cocoa/Base.lproj/Localizable.strings
.vscode
# Xcode
*.xcworkspace
!default.xcworkspace

3
.gitmodules

@ -1,6 +1,3 @@
[submodule "dupeguru"]
path = dupeguru
url = https://github.com/hsoft/dupeguru.git
[submodule "hscommon"]
path = hscommon
url = https://github.com/hsoft/hscommon.git

2
build.py

@ -90,7 +90,7 @@ def build_cocoa(dev):
os.mkdir(pydep_folder)
shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
tocopy = [
'dupeguru/core', 'hscommon', 'cocoa/inter', 'cocoalib/cocoa', 'objp', 'send2trash', 'hsaudiotag',
'dupeguru/core', 'dupeguru/hscommon', 'cocoa/inter', 'cocoalib/cocoa', 'objp', 'send2trash', 'hsaudiotag',
]
copy_packages(tocopy, pydep_folder, create_links=dev)
sys.path.insert(0, 'build')

2
cocoalib/HSErrorReportWindow.m

@ -38,6 +38,6 @@ http://www.gnu.org/licenses/gpl-3.0.html
- (IBAction)close:(id)sender
{
[[self window] orderOut:self];
[NSApp stopModalWithCode:NSOKButton];
[NSApp stopModalWithCode:NSModalResponseOK];
}
@end

1
hscommon

@ -1 +0,0 @@
Subproject commit a56aee2f08becba9b968ff96caa3a7f6651a4c74

7
package.py

@ -6,6 +6,11 @@
from argparse import ArgumentParser
# Modify the python path so the hscommon files in the dupeguru submodule may be used
import sys
import os
sys.path.append(os.path.join(os.getcwd(), 'dupeguru'))
from hscommon.build import setup_package_argparser, package_cocoa_app_in_dmg
def parse_args():
@ -14,7 +19,7 @@ def parse_args():
return parser.parse_args()
def package_cocoa(args):
app_path = 'build/dupeGuru.app'
app_path = 'build/Release/dupeGuru.app'
package_cocoa_app_in_dmg(app_path, '.', args)
def main():

Loading…
Cancel
Save