-
Notifications
You must be signed in to change notification settings - Fork 20
Add customized directories issues/21 #37
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
601983b
8946f43
675119b
0caf031
afdfca0
eb461fa
f68f2a8
4f8e46a
988f6ce
6401065
d93a8b1
af0a580
971eca0
0341661
10bc39d
59fdcbe
9ff341b
36108f5
cfa48bf
11fd560
5f2e25f
44e7281
fbcf4ea
ba7b84c
f574f04
4a6af03
214225e
a7ea1ed
310c514
50d146e
ae02ccc
b70b3ae
ebd0e2c
66d67d0
6182bb2
4abb66f
1bfb753
c490523
382fdae
2229d18
01a6b1f
a043bfe
53f9bc2
bb2373a
5c4af37
3ce943d
0eb1274
bdb8714
66936bf
9cff7b2
581d157
54596d9
d5e56f7
c09743d
e501059
ed8d5bf
4275e36
e673699
7c557de
969229e
fef0f43
fec49b1
cb56769
d92e792
beb97f7
bf00874
5c0bbff
bdfec2f
6c77404
a07e2f1
8a4d657
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,9 +5,45 @@ rem Copyright (c) 2023 FREE WING,Y.Sakamoto | |
| echo %0 | ||
| @echo off | ||
|
|
||
| rem Load configuration from directories_config.bat if it exists | ||
| rem Otherwise, use default values | ||
| if exist directories_config.bat ( | ||
| echo Loading configuration from directories_config.bat | ||
| call directories_config.bat | ||
| ) else ( | ||
| echo directories_config.bat not found, creating with default values | ||
| rem Configure Qt installation directory (default is C:\Qt) | ||
| if "%QT_INSTALL_DIR%" == "" set QT_INSTALL_DIR=C:\Qt | ||
|
|
||
| rem Configure Fritzing workspace directory (default is \00_fritzing) | ||
| if "%FRITZING_WORKSPACE_DIR%" == "" set FRITZING_WORKSPACE_DIR=\00_fritzing | ||
|
|
||
| rem Configure Visual Studio installation directory | ||
| if "%VS_INSTALL_DIR%" == "" set VS_INSTALL_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools | ||
|
|
||
| rem Create the configuration file | ||
| echo @echo off> directories_config.bat | ||
| echo rem directories_config.bat>> directories_config.bat | ||
| echo rem Configuration file for directory paths used in Fritzing build scripts>> directories_config.bat | ||
| echo rem This file is meant to be persistent and can be edited manually>> directories_config.bat | ||
| echo.>> directories_config.bat | ||
| echo rem Qt installation directory>> directories_config.bat | ||
| echo set QT_INSTALL_DIR=%QT_INSTALL_DIR%>> directories_config.bat | ||
| echo.>> directories_config.bat | ||
| echo rem Fritzing workspace directory>> directories_config.bat | ||
| echo set FRITZING_WORKSPACE_DIR=%FRITZING_WORKSPACE_DIR%>> directories_config.bat | ||
| echo.>> directories_config.bat | ||
| echo rem Visual Studio installation directory>> directories_config.bat | ||
| echo set VS_INSTALL_DIR=%VS_INSTALL_DIR%>> directories_config.bat | ||
| ) | ||
|
|
||
| echo Using Qt installation directory: %QT_INSTALL_DIR% | ||
| echo Using Fritzing workspace directory: %FRITZING_WORKSPACE_DIR% | ||
| echo Using Visual Studio directory: %VS_INSTALL_DIR% | ||
|
|
||
| cd \ | ||
| mkdir \00_fritzing | ||
| cd /d \00_fritzing | ||
| mkdir %FRITZING_WORKSPACE_DIR% | ||
| cd /d %FRITZING_WORKSPACE_DIR% | ||
|
|
||
| rem https://github.com/FREEWING-JP/CSharp_DownloadFile | ||
| rem echo C# DownloadFile from URL | ||
|
|
@@ -32,3 +68,23 @@ UnZip.exe main.zip . | |
| move Build-Fritzing-1.0.0-Windows-script-main\*.* .\ | ||
| rmdir Build-Fritzing-1.0.0-Windows-script-main | ||
|
|
||
| rem Update directories_config.bat if it already exists | ||
| if not exist directories_config.bat ( | ||
| rem Create the configuration file | ||
| echo @echo off> directories_config.bat | ||
| echo rem directories_config.bat>> directories_config.bat | ||
| echo rem Configuration file for directory paths used in Fritzing build scripts>> directories_config.bat | ||
| echo rem This file is meant to be persistent and can be edited manually>> directories_config.bat | ||
| echo.>> directories_config.bat | ||
| echo rem Qt installation directory>> directories_config.bat | ||
| echo set QT_INSTALL_DIR=%QT_INSTALL_DIR%>> directories_config.bat | ||
| echo.>> directories_config.bat | ||
| echo rem Fritzing workspace directory>> directories_config.bat | ||
| echo set FRITZING_WORKSPACE_DIR=%FRITZING_WORKSPACE_DIR%>> directories_config.bat | ||
| echo.>> directories_config.bat | ||
| echo rem Visual Studio installation directory>> directories_config.bat | ||
| echo set VS_INSTALL_DIR=%VS_INSTALL_DIR%>> directories_config.bat | ||
| echo.>> directories_config.bat | ||
| echo rem Created by 00_Download_Script.bat>> directories_config.bat | ||
| ) | ||
|
Comment on lines
+71
to
+89
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. [ask]
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If the file doesn't exist it creates it. Otherwise it will fail.
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this section is not need . |
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,12 @@ | ||
| @echo off | ||
| rem 00_Execute_Script.bat | ||
| rem http://www.neko.ne.jp/~freewing/software/build_fritzing_100_windows/ | ||
| rem Copyright (c) 2023 FREE WING,Y.Sakamoto | ||
| rem Copyright (c) 2025 FREE WING,Y.Sakamoto | ||
| echo %0 | ||
| cd /d \00_fritzing | ||
| rem Load configuration | ||
| if exist directories_config.bat call directories_config.bat | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
The |
||
|
|
||
| cd /d %FRITZING_WORKSPACE_DIR% | ||
|
|
||
| start /wait 02_Download_Requirement_Files.bat | ||
| start /wait 03_Install_Qt_653.bat | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,10 @@ rem http://www.neko.ne.jp/~freewing/software/build_fritzing_100_windows/ | |
| rem Copyright (c) 2023-2024 FREE WING,Y.Sakamoto | ||
| echo %0 | ||
| timeout /T 10 /NOBREAK | ||
| cd /d \00_fritzing | ||
| rem Load configuration | ||
| if exist directories_config.bat call directories_config.bat | ||
|
|
||
| cd /d %FRITZING_WORKSPACE_DIR% | ||
|
|
||
| rem https://git-scm.com/download/win | ||
| echo Git - Downloading Package Download for Windows | ||
|
|
@@ -82,5 +85,4 @@ echo === | |
| echo Download Error | ||
| echo === | ||
| rundll32 user32.dll,MessageBeep | ||
| pause | ||
|
|
||
| pause | ||
|
Comment on lines
-86
to
+88
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||

Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change to
call directories_config.batBecause Will change it to do the same processing in
directories_config.bat, so can delete this section .